Branch HEAD

make HEAD compilable

diff --git a/lustre/ptlrpc/wiretest.c b/lustre/ptlrpc/wiretest.c
index 5e6a6cc..c383a0d 100644 (file)
--- a/lustre/ptlrpc/wiretest.c
+++ b/lustre/ptlrpc/wiretest.c
@@ -455,7 +455,6 @@ void lustre_assert_wire_constants(void)
         CLASSERT(OBD_CONNECT_REQPORTAL == 0x00000040ULL);
         CLASSERT(OBD_CONNECT_ACL == 0x00000080ULL);
         CLASSERT(OBD_CONNECT_XATTR == 0x00000100ULL);
-        CLASSERT(OBD_CONNECT_REAL == 0x00000200ULL);
         CLASSERT(OBD_CONNECT_TRUNCLOCK == 0x00000400ULL);
         CLASSERT(OBD_CONNECT_IBITS == 0x00001000ULL);
         CLASSERT(OBD_CONNECT_JOIN == 0x00002000ULL);
@@ -470,7 +469,9 @@ void lustre_assert_wire_constants(void)
         CLASSERT(OBD_CONNECT_CANCELSET == 0x00400000ULL);
         CLASSERT(OBD_CONNECT_SOM == 0x00800000ULL);
         CLASSERT(OBD_CONNECT_AT == 0x01000000ULL);
-        CLASSERT(OBD_CONNECT_MDS_MDS == 0x02000000ULL);
+        CLASSERT(OBD_CONNECT_LRU_RESIZE == 0x02000000ULL);
+        CLASSERT(OBD_CONNECT_MDS_MDS == 0x04000000ULL);
+        CLASSERT(OBD_CONNECT_REAL == 0x08000000ULL);
 
         /* Checks for struct obdo */
         LASSERTF((int)sizeof(struct obdo) == 208, " found %lld\n",

diff --git a/lustre/utils/wiretest.c b/lustre/utils/wiretest.c
index d7c2574..77ab11e 100644 (file)
--- a/lustre/utils/wiretest.c
+++ b/lustre/utils/wiretest.c
@@ -471,7 +471,6 @@ void lustre_assert_wire_constants(void)
         CLASSERT(OBD_CONNECT_REQPORTAL == 0x00000040ULL);
         CLASSERT(OBD_CONNECT_ACL == 0x00000080ULL);
         CLASSERT(OBD_CONNECT_XATTR == 0x00000100ULL);
-        CLASSERT(OBD_CONNECT_REAL == 0x00000200ULL);
         CLASSERT(OBD_CONNECT_TRUNCLOCK == 0x00000400ULL);
         CLASSERT(OBD_CONNECT_IBITS == 0x00001000ULL);
         CLASSERT(OBD_CONNECT_JOIN == 0x00002000ULL);
@@ -486,7 +485,9 @@ void lustre_assert_wire_constants(void)
         CLASSERT(OBD_CONNECT_CANCELSET == 0x00400000ULL);
         CLASSERT(OBD_CONNECT_SOM == 0x00800000ULL);
         CLASSERT(OBD_CONNECT_AT == 0x01000000ULL);
-        CLASSERT(OBD_CONNECT_MDS_MDS == 0x02000000ULL);
+        CLASSERT(OBD_CONNECT_LRU_RESIZE == 0x02000000ULL);
+        CLASSERT(OBD_CONNECT_MDS_MDS == 0x04000000ULL);
+        CLASSERT(OBD_CONNECT_REAL == 0x08000000ULL);
 
         /* Checks for struct obdo */
         LASSERTF((int)sizeof(struct obdo) == 208, " found %lld\n",