svn commit: samba r13733 - in branches/SAMBA_3_0/source/include: .
jpeach at samba.org
jpeach at samba.org
Mon Feb 27 23:45:50 GMT 2006
Author: jpeach
Date: 2006-02-27 23:45:49 +0000 (Mon, 27 Feb 2006)
New Revision: 13733
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=13733
Log:
Reorder so that locking and params declarations are not mingled.
Modified:
branches/SAMBA_3_0/source/include/smb.h
Changeset:
Modified: branches/SAMBA_3_0/source/include/smb.h
===================================================================
--- branches/SAMBA_3_0/source/include/smb.h 2006-02-27 22:37:34 UTC (rev 13732)
+++ branches/SAMBA_3_0/source/include/smb.h 2006-02-27 23:45:49 UTC (rev 13733)
@@ -764,22 +764,11 @@
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 @@
} 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 @@
#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
More information about the samba-cvs
mailing list