Branch HEAD

[fs/lustre-release.git] / lustre / utils / wiretest.c

diff --git a/lustre/utils/wiretest.c b/lustre/utils/wiretest.c
index d7c2574..9153194 100644 (file)
--- a/lustre/utils/wiretest.c
+++ b/lustre/utils/wiretest.c
@@ -28,8 +28,8 @@ void lustre_assert_wire_constants(void)
 {
         /* Wire protocol assertions generated by 'wirecheck'
          * (make -C lustre/utils newwirecheck)
-         * running on Linux duplo 2.6.17.3 #4 Wed Oct 18 02:46:08 MSD 2006 i686 unknown unknown GNU/L
-         * with gcc version 3.4.6 */
+         * running on Linux hideous 2.6.9-prep.qp3.5.34.4qsnet #3 Mon Aug 13 08:38:55 EEST 2007 i686 
+         * with gcc version 3.4.6 20060404 (Red Hat 3.4.6-3) */
 
 
         /* Constants... */
@@ -153,6 +153,8 @@ void lustre_assert_wire_constants(void)
                  (long long)MGS_TARGET_REG);
         LASSERTF(MGS_TARGET_DEL == 254, " found %lld\n",
                  (long long)MGS_TARGET_DEL);
+        LASSERTF(MGS_SET_INFO == 255, " found %lld\n",
+                 (long long)MGS_SET_INFO);
         LASSERTF(DISP_IT_EXECD == 1, " found %lld\n",
                  (long long)DISP_IT_EXECD);
         LASSERTF(DISP_LOOKUP_EXECD == 2, " found %lld\n",
@@ -225,6 +227,8 @@ void lustre_assert_wire_constants(void)
                  (long long)MGS_TARGET_REG);
         LASSERTF(MGS_TARGET_DEL == 254, " found %lld\n",
                  (long long)MGS_TARGET_DEL);
+        LASSERTF(MGS_SET_INFO == 255, " found %lld\n",
+                 (long long)MGS_SET_INFO);
         /* Sizes and Offsets */
 
         /* Checks for struct obd_uuid */
@@ -395,18 +399,14 @@ void lustre_assert_wire_constants(void)
                  (long long)(int)offsetof(struct ptlrpc_body, pb_padding_2));
         LASSERTF((int)sizeof(((struct ptlrpc_body *)0)->pb_padding_2) == 4, " found %lld\n",
                  (long long)(int)sizeof(((struct ptlrpc_body *)0)->pb_padding_2));
-        LASSERTF((int)offsetof(struct ptlrpc_body, pb_padding_3) == 76, " found %lld\n",
-                 (long long)(int)offsetof(struct ptlrpc_body, pb_padding_3));
-        LASSERTF((int)sizeof(((struct ptlrpc_body *)0)->pb_padding_3) == 4, " found %lld\n",
-                 (long long)(int)sizeof(((struct ptlrpc_body *)0)->pb_padding_3));
-        LASSERTF((int)offsetof(struct ptlrpc_body, pb_padding_4) == 80, " found %lld\n",
-                 (long long)(int)offsetof(struct ptlrpc_body, pb_padding_4));
-        LASSERTF((int)sizeof(((struct ptlrpc_body *)0)->pb_padding_4) == 4, " found %lld\n",
-                 (long long)(int)sizeof(((struct ptlrpc_body *)0)->pb_padding_4));
-        LASSERTF((int)offsetof(struct ptlrpc_body, pb_padding_5) == 84, " found %lld\n",
-                 (long long)(int)offsetof(struct ptlrpc_body, pb_padding_5));
-        LASSERTF((int)sizeof(((struct ptlrpc_body *)0)->pb_padding_5) == 4, " found %lld\n",
-                 (long long)(int)sizeof(((struct ptlrpc_body *)0)->pb_padding_5));
+        LASSERTF((int)offsetof(struct ptlrpc_body, pb_slv) == 80, " found %lld\n",
+                 (long long)(int)offsetof(struct ptlrpc_body, pb_slv));
+        LASSERTF((int)sizeof(((struct ptlrpc_body *)0)->pb_slv) == 8, " found %lld\n",
+                 (long long)(int)sizeof(((struct ptlrpc_body *)0)->pb_slv));
+        LASSERTF((int)offsetof(struct ptlrpc_body, pb_limit) == 76, " found %lld\n",
+                 (long long)(int)offsetof(struct ptlrpc_body, pb_limit));
+        LASSERTF((int)sizeof(((struct ptlrpc_body *)0)->pb_limit) == 4, " found %lld\n",
+                 (long long)(int)sizeof(((struct ptlrpc_body *)0)->pb_limit));
 
         /* Checks for struct obd_connect_data */
         LASSERTF((int)sizeof(struct obd_connect_data) == 72, " found %lld\n",
@@ -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",