r=adilger

reserve some connect flags

diff --git a/lustre/include/lustre/lustre_idl.h b/lustre/include/lustre/lustre_idl.h
index 0cdb6a3..0dbe243 100644 (file)
--- a/lustre/include/lustre/lustre_idl.h
+++ b/lustre/include/lustre/lustre_idl.h
@@ -284,6 +284,8 @@ extern void lustre_swab_ptlrpc_body(struct ptlrpc_body *pb);
 #define OBD_CONNECT_FID_CAPA  0x100000ULL /* fid capability */
 #define OBD_CONNECT_OSS_CAPA  0x200000ULL /* OSS capability */
 #define OBD_CONNECT_CANCELSET 0x400000ULL /* Early batched cancels. */
+#define OBD_CONNECT_SOM     0x00800000ULL /* Size on MDS */
+#define OBD_CONNECT_AT      0x01000000ULL /* client uses adaptive timeouts */
 /* also update obd_connect_names[] for lprocfs_rd_connect_flags()
  * and lustre/utils/wirecheck.c */
 

diff --git a/lustre/obdclass/lprocfs_status.c b/lustre/obdclass/lprocfs_status.c
index fd27fd9..29bc508 100644 (file)
--- a/lustre/obdclass/lprocfs_status.c
+++ b/lustre/obdclass/lprocfs_status.c
@@ -514,6 +514,8 @@ static const char *obd_connect_names[] = {
         "fid_capability",
         "oss_capability",
         "early_lock_cancel",
+        "size_on_mds",
+        "adaptive_timeout",
         NULL
 };
 

diff --git a/lustre/utils/wirecheck.c b/lustre/utils/wirecheck.c
index 29f0264..dfd2604 100644 (file)
--- a/lustre/utils/wirecheck.c
+++ b/lustre/utils/wirecheck.c
@@ -179,6 +179,8 @@ static void check_obd_connect_data(void)
         CHECK_CDEFINE(OBD_CONNECT_FID_CAPA);
         CHECK_CDEFINE(OBD_CONNECT_OSS_CAPA);
         CHECK_CDEFINE(OBD_CONNECT_CANCELSET);
+        CHECK_CDEFINE(OBD_CONNECT_SOM);
+        CHECK_CDEFINE(OBD_CONNECT_AT);
 }
 
 static void