Branch HEAD

b=14149
a=15414
i=yong.fan
i=yury.umanets

correct OBD_CONNECT_FID definition.

diff --git a/lustre/include/lustre/lustre_idl.h b/lustre/include/lustre/lustre_idl.h
index 6b2bf7c..be6b8d1 100644 (file)
--- a/lustre/include/lustre/lustre_idl.h
+++ b/lustre/include/lustre/lustre_idl.h
@@ -549,8 +549,10 @@ extern void lustre_swab_ptlrpc_body(struct ptlrpc_body *pb);
 #define OBD_CONNECT_LRU_RESIZE 0x02000000ULL /* Lru resize feature. */
 #define OBD_CONNECT_MDS_MDS    0x04000000ULL /* MDS-MDS connection*/
 #define OBD_CONNECT_REAL       0x08000000ULL /* real connection */
-#define OBD_CONNECT_FID        0x10000000ULL /* FID is supported by server */
+#define OBD_CONNECT_CHANGE_QS  0x10000000ULL /*shrink/enlarge qunit size
+                                              *b=10600 */
 #define OBD_CONNECT_CKSUM      0x20000000ULL /* support several cksum algos */
+#define OBD_CONNECT_FID        0x40000000ULL /* FID is supported by server */
 
 /* 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 4a65259..4fc61c9 100644 (file)
--- a/lustre/obdclass/lprocfs_status.c
+++ b/lustre/obdclass/lprocfs_status.c
@@ -604,6 +604,7 @@ static const char *obd_connect_names[] = {
         "real_conn",
         "change_qunit_size",
         "alt_checksum_algorithm",
+        "fid_is_enabled",
         NULL
 };