summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2011-05-03 16:25:20 +0200
committerGünther Deschner <gd@samba.org>2011-05-03 21:03:47 +0200
commit89e60556065c6e3dc7a8447cdba5a8fed1d19ea4 (patch)
tree1f5aef0c815d695582ae1e6911cc16e2bbd59e72
parenta3609457912123037ca9fc51349d89d7921bc4e7 (diff)
downloadsamba-89e60556065c6e3dc7a8447cdba5a8fed1d19ea4.tar.gz
samba-89e60556065c6e3dc7a8447cdba5a8fed1d19ea4.tar.bz2
samba-89e60556065c6e3dc7a8447cdba5a8fed1d19ea4.zip
s3-includes: move enum flush_reason_enum to smb.h
Guenther
-rw-r--r--source3/include/includes.h16
-rw-r--r--source3/include/smb.h16
2 files changed, 16 insertions, 16 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 503299842b..6be6b01133 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -542,22 +542,6 @@ typedef char fstring[FSTRING_LEN];
#include "../lib/util/smb_threads.h"
#include "../lib/util/smb_threads_internal.h"
-/*
- * Reasons for cache flush.
- */
-
-enum flush_reason_enum {
- SEEK_FLUSH,
- READ_FLUSH,
- WRITE_FLUSH,
- READRAW_FLUSH,
- OPLOCK_RELEASE_FLUSH,
- CLOSE_FLUSH,
- SYNC_FLUSH,
- SIZECHANGE_FLUSH,
- /* NUM_FLUSH_REASONS must remain the last value in the enumeration. */
- NUM_FLUSH_REASONS};
-
/***** prototypes *****/
#ifndef NO_PROTO_H
#include "proto.h"
diff --git a/source3/include/smb.h b/source3/include/smb.h
index 827a9db018..57de387661 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -1701,4 +1701,20 @@ struct deferred_open_record;
/* Used inside aio code. */
struct aio_extra;
+/*
+ * Reasons for cache flush.
+ */
+
+enum flush_reason_enum {
+ SEEK_FLUSH,
+ READ_FLUSH,
+ WRITE_FLUSH,
+ READRAW_FLUSH,
+ OPLOCK_RELEASE_FLUSH,
+ CLOSE_FLUSH,
+ SYNC_FLUSH,
+ SIZECHANGE_FLUSH,
+ /* NUM_FLUSH_REASONS must remain the last value in the enumeration. */
+ NUM_FLUSH_REASONS};
+
#endif /* _SMB_H */