Branch HEAD

Merge OBD_CONNECT_LRU_RESIZE from b1_6 to keep flags consistent.

lustre/include/lustre/lustre_idl.h

@@ -523,8 +523,9 @@ extern void lustre_swab_ptlrpc_body(struct ptlrpc_body *pb);
 #define OBD_CONNECT_CANCELSET  0x00400000ULL /* Early batched cancels. */
 #define OBD_CONNECT_SOM        0x00800000ULL /* SOM feature */
 #define OBD_CONNECT_AT         0x01000000ULL /* client uses adaptive timeouts */
-#define OBD_CONNECT_MDS_MDS    0x02000000ULL /* MDS-MDS connection*/
-#define OBD_CONNECT_REAL       0x00000200ULL /* real connection */
+#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 */
 /* also update obd_connect_names[] for lprocfs_rd_connect_flags()
  * and lustre/utils/wirecheck.c */