summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Peach <jpeach@samba.org>2006-02-27 23:45:49 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:10:51 -0500
commit554155473b66cb184d1b4f0831d494766f4bc259 (patch)
treea0132277ea25aecdf800ef260e1c0ecf0e21d5f2
parent2479b8305b71bc153f808827cd63618af8fe93d8 (diff)
downloadsamba-554155473b66cb184d1b4f0831d494766f4bc259.tar.gz
samba-554155473b66cb184d1b4f0831d494766f4bc259.tar.bz2
samba-554155473b66cb184d1b4f0831d494766f4bc259.zip
r13733: Reorder so that locking and params declarations are not mingled.
(This used to be commit cde31d5957ff9a009e111ab3719d20e70a5053b6)
-rw-r--r--source3/include/smb.h35
1 files changed, 18 insertions, 17 deletions
diff --git a/source3/include/smb.h b/source3/include/smb.h
index 832f91f9bd..352c75fd9c 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -764,22 +764,11 @@ typedef enum {
P_LOCAL,P_GLOBAL,P_SEPARATOR,P_NONE
} parm_class;
-/* passed to br lock code */
-enum brl_type {READ_LOCK, WRITE_LOCK, PENDING_LOCK};
-
struct enum_list {
int value;
const char *name;
};
-#define BRLOCK_FN_CAST() \
- void (*)(SMB_DEV_T dev, SMB_INO_T ino, struct process_id pid, \
- enum brl_type lock_type, \
- br_off start, br_off size)
-#define BRLOCK_FN(fn) \
- void (*fn)(SMB_DEV_T dev, SMB_INO_T ino, struct process_id pid, \
- enum brl_type lock_type, \
- br_off start, br_off size)
struct parm_struct {
const char *label;
parm_type type;
@@ -797,11 +786,6 @@ struct parm_struct {
} def;
};
-struct bitmap {
- uint32 *b;
- unsigned int n;
-};
-
/* The following flags are used in SWAT */
#define FLAG_BASIC 0x0001 /* Display only in BASIC view */
#define FLAG_SHARE 0x0002 /* file sharing options */
@@ -814,11 +798,28 @@ struct bitmap {
#define FLAG_HIDE 0x2000 /* options that should be hidden in SWAT */
#define FLAG_DOS_STRING 0x4000 /* convert from UNIX to DOS codepage when reading this string. */
+/* passed to br lock code */
+enum brl_type {READ_LOCK, WRITE_LOCK, PENDING_LOCK};
+
+#define BRLOCK_FN_CAST() \
+ void (*)(SMB_DEV_T dev, SMB_INO_T ino, struct process_id pid, \
+ enum brl_type lock_type, \
+ br_off start, br_off size)
+
+#define BRLOCK_FN(fn) \
+ void (*fn)(SMB_DEV_T dev, SMB_INO_T ino, struct process_id pid, \
+ enum brl_type lock_type, \
+ br_off start, br_off size)
+
+struct bitmap {
+ uint32 *b;
+ unsigned int n;
+};
+
#ifndef LOCKING_VERSION
#define LOCKING_VERSION 4
#endif /* LOCKING_VERSION */
-
/* the basic packet size, assuming no words or bytes */
#define smb_size 39