b=19955

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

diff --git a/lustre/ptlrpc/wiretest.c b/lustre/ptlrpc/wiretest.c
index 790f861..5ced28f 100644 (file)
--- a/lustre/ptlrpc/wiretest.c
+++ b/lustre/ptlrpc/wiretest.c
@@ -65,7 +65,7 @@ void lustre_assert_wire_constants(void)
 {
         /* Wire protocol assertions generated by 'wirecheck'
          * (make -C lustre/utils newwiretest)
-         * running on Linux lin3 2.6.18-128.1.1-prep #1 SMP Wed Mar 4 23:08:37 MST 2009 i686 i686 i38
+         * running on Linux cfs21 2.6.18-92.el5xen #1 SMP Tue Jun 10 19:55:54 EDT 2008 i686 i686 i386
          * with gcc version 4.1.2 20071124 (Red Hat 4.1.2-42) */
 
 
@@ -232,7 +232,9 @@ void lustre_assert_wire_constants(void)
                  (long long)LDLM_CP_CALLBACK);
         LASSERTF(LDLM_GL_CALLBACK == 106, " found %lld\n",
                  (long long)LDLM_GL_CALLBACK);
-        LASSERTF(LDLM_LAST_OPC == 107, " found %lld\n",
+        LASSERTF(LDLM_SET_INFO == 107, " found %lld\n",
+                 (long long)LDLM_SET_INFO);
+        LASSERTF(LDLM_LAST_OPC == 108, " found %lld\n",
                  (long long)LDLM_LAST_OPC);
         LASSERTF(LCK_EX == 1, " found %lld\n",
                  (long long)LCK_EX);
@@ -645,19 +647,19 @@ void lustre_assert_wire_constants(void)
         CLASSERT(OBD_MD_FLXATTRLS == (0x0000002000000000ULL));
         CLASSERT(OBD_MD_FLXATTRRM == (0x0000004000000000ULL));
         CLASSERT(OBD_MD_FLACL == (0x0000008000000000ULL));
-        CLASSERT(OBD_FL_INLINEDATA == (0x00000001));
-        CLASSERT(OBD_FL_OBDMDEXISTS == (0x00000002));
-        CLASSERT(OBD_FL_DELORPHAN == (0x00000004));
-        CLASSERT(OBD_FL_NORPC == (0x00000008));
-        CLASSERT(OBD_FL_IDONLY == (0x00000010));
-        CLASSERT(OBD_FL_RECREATE_OBJS == (0x00000020));
-        CLASSERT(OBD_FL_DEBUG_CHECK == (0x00000040));
-        CLASSERT(OBD_FL_NO_USRQUOTA == (0x00000100));
-        CLASSERT(OBD_FL_NO_GRPQUOTA == (0x00000200));
-        CLASSERT(OBD_FL_TRUNCLOCK == (0x00000800));
-        CLASSERT(OBD_FL_CKSUM_CRC32 == (0x00001000));
-        CLASSERT(OBD_FL_CKSUM_ADLER == (0x00002000));
-        CLASSERT(OBD_FL_SHRINK_GRANT == (0x00020000));
+        CLASSERT(OBD_FL_INLINEDATA == 1);
+        CLASSERT(OBD_FL_OBDMDEXISTS == 2);
+        CLASSERT(OBD_FL_DELORPHAN == 4);
+        CLASSERT(OBD_FL_NORPC == 8);
+        CLASSERT(OBD_FL_IDONLY == 16);
+        CLASSERT(OBD_FL_RECREATE_OBJS == 32);
+        CLASSERT(OBD_FL_DEBUG_CHECK == 64);
+        CLASSERT(OBD_FL_NO_USRQUOTA == 256);
+        CLASSERT(OBD_FL_NO_GRPQUOTA == 512);
+        CLASSERT(OBD_FL_TRUNCLOCK == 2048);
+        CLASSERT(OBD_FL_CKSUM_CRC32 == 4096);
+        CLASSERT(OBD_FL_CKSUM_ADLER == 8192);
+        CLASSERT(OBD_FL_SHRINK_GRANT == 131072);
         CLASSERT(OBD_CKSUM_CRC32 == 1);
         CLASSERT(OBD_CKSUM_ADLER == 2);
 
@@ -2495,16 +2497,17 @@ void lustre_assert_wire_constants(void)
         /* Checks for struct link_ea_entry */
         LASSERTF((int)sizeof(struct link_ea_entry) == 20, " found %lld\n",
                  (long long)(int)sizeof(struct link_ea_entry));
-        LASSERTF((int)offsetof(struct link_ea_entry, lee_parent_fid) == 0, " found %lld\n",
-                 (long long)(int)offsetof(struct link_ea_entry, lee_parent_fid));
-        LASSERTF((int)sizeof(((struct link_ea_entry *)0)->lee_parent_fid) == 16, " found %lld\n",
-                 (long long)(int)sizeof(((struct link_ea_entry *)0)->lee_parent_fid));
         LASSERTF((int)offsetof(struct link_ea_entry, lee_reclen) == 16, " found %lld\n",
                  (long long)(int)offsetof(struct link_ea_entry, lee_reclen));
         LASSERTF((int)sizeof(((struct link_ea_entry *)0)->lee_reclen) == 2, " found %lld\n",
                  (long long)(int)sizeof(((struct link_ea_entry *)0)->lee_reclen));
+        LASSERTF((int)offsetof(struct link_ea_entry, lee_parent_fid) == 0, " found %lld\n",
+                 (long long)(int)offsetof(struct link_ea_entry, lee_parent_fid));
+        LASSERTF((int)sizeof(((struct link_ea_entry *)0)->lee_parent_fid) == 16, " found %lld\n",
+                 (long long)(int)sizeof(((struct link_ea_entry *)0)->lee_parent_fid));
         LASSERTF((int)offsetof(struct link_ea_entry, lee_name) == 20, " found %lld\n",
                  (long long)(int)offsetof(struct link_ea_entry, lee_name));
         LASSERTF((int)sizeof(((struct link_ea_entry *)0)->lee_name) == 0, " found %lld\n",
                  (long long)(int)sizeof(((struct link_ea_entry *)0)->lee_name));
 }
+