Branch b1_5

r=adilger

Move #define OBD_CONNECT_EMPTY to the end for consistency.

diff --git a/lustre/include/lustre/lustre_idl.h b/lustre/include/lustre/lustre_idl.h
index 56f88e3..599c485 100644 (file)
--- a/lustre/include/lustre/lustre_idl.h
+++ b/lustre/include/lustre/lustre_idl.h
@@ -254,9 +254,10 @@ extern void lustre_swab_ptlrpc_body(struct ptlrpc_body *pb);
 #define OBD_CONNECT_JOIN      0x2000ULL /* files can be concatenated */
 #define OBD_CONNECT_ATTRFID   0x4000ULL /* Server supports GetAttr By Fid */
 #define OBD_CONNECT_NODEVOH   0x8000ULL /* No open handle for special nodes */
-#define OBD_CONNECT_EMPTY 0x80000000ULL /* fake: these are empty connect flags*/
 #define OBD_CONNECT_RMT_CLIENT 0x10000ULL /* Remote client */
 
+#define OBD_CONNECT_EMPTY 0x80000000ULL /* fake: these are empty connect flags*/
+
 /* also update obd_connect_names[] for lprocfs_rd_connect_flags() */
 
 #define MDS_CONNECT_SUPPORTED  (OBD_CONNECT_RDONLY | OBD_CONNECT_VERSION | \