LU-1715 ptlrpc: flock deadlock detection does not work

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

diff --git a/lustre/utils/wiretest.c b/lustre/utils/wiretest.c
index c35024c..62cbfa1 100644 (file)
--- a/lustre/utils/wiretest.c
+++ b/lustre/utils/wiretest.c
@@ -62,8 +62,8 @@ void lustre_assert_wire_constants(void)
 {
         /* Wire protocol assertions generated by 'wirecheck'
          * (make -C lustre/utils newwiretest)
-         * running on Linux deva 2.6.32.279.lustre #5 SMP Tue Apr 9 22:52:17 CST 2013 x86_64 x86_64 x
-         * with gcc version 4.4.4 20100726 (Red Hat 4.4.4-13) (GCC)  */
+         * running on Linux centos6-bis 2.6.32-358.0.1.el6-head #3 SMP Wed Apr 17 17:37:43 CEST 2013 
+         * with gcc version 4.4.6 20110731 (Red Hat 4.4.6-3) (GCC)  */
 
 
        /* Constants... */
@@ -445,6 +445,10 @@ void lustre_assert_wire_constants(void)
                (unsigned)LMAC_HSM);
        LASSERTF(LMAC_SOM == 0x00000002UL, "found 0x%.8xUL\n",
                (unsigned)LMAC_SOM);
+       LASSERTF(LMAC_NOT_IN_OI == 0x00000004UL, "found 0x%.8xUL\n",
+               (unsigned)LMAC_NOT_IN_OI);
+       LASSERTF(LMAC_FID_ON_OST == 0x00000008UL, "found 0x%.8xUL\n",
+               (unsigned)LMAC_FID_ON_OST);
        LASSERTF(OBJ_CREATE == 1, "found %lld\n",
                 (long long)OBJ_CREATE);
        LASSERTF(OBJ_DESTROY == 2, "found %lld\n",
@@ -1162,6 +1166,8 @@ void lustre_assert_wire_constants(void)
                 OBD_CONNECT_SHORTIO);
        LASSERTF(OBD_CONNECT_PINGLESS == 0x4000000000000ULL, "found 0x%.16llxULL\n",
                 OBD_CONNECT_PINGLESS);
+       LASSERTF(OBD_CONNECT_FLOCK_DEAD == 0x8000000000000ULL, "found 0x%.16llxULL\n",
+                OBD_CONNECT_FLOCK_DEAD);
        LASSERTF(OBD_CKSUM_CRC32 == 0x00000001UL, "found 0x%.8xUL\n",
                (unsigned)OBD_CKSUM_CRC32);
        LASSERTF(OBD_CKSUM_ADLER == 0x00000002UL, "found 0x%.8xUL\n",
@@ -1348,6 +1354,8 @@ void lustre_assert_wire_constants(void)
                 OBD_MD_REINT);
        LASSERTF(OBD_MD_MEA == (0x0000000400000000ULL), "found 0x%.16llxULL\n",
                 OBD_MD_MEA);
+       LASSERTF(OBD_MD_TSTATE == (0x0000000800000000ULL), "found 0x%.16llxULL\n",
+                OBD_MD_TSTATE);
        LASSERTF(OBD_MD_FLXATTR == (0x0000001000000000ULL), "found 0x%.16llxULL\n",
                 OBD_MD_FLXATTR);
        LASSERTF(OBD_MD_FLXATTRLS == (0x0000002000000000ULL), "found 0x%.16llxULL\n",
@@ -1931,10 +1939,10 @@ void lustre_assert_wire_constants(void)
                 (long long)(int)offsetof(struct mdt_body, blocks));
        LASSERTF((int)sizeof(((struct mdt_body *)0)->blocks) == 8, "found %lld\n",
                 (long long)(int)sizeof(((struct mdt_body *)0)->blocks));
-       LASSERTF((int)offsetof(struct mdt_body, unused1) == 96, "found %lld\n",
-                (long long)(int)offsetof(struct mdt_body, unused1));
-       LASSERTF((int)sizeof(((struct mdt_body *)0)->unused1) == 8, "found %lld\n",
-                (long long)(int)sizeof(((struct mdt_body *)0)->unused1));
+       LASSERTF((int)offsetof(struct mdt_body, t_state) == 96, "found %lld\n",
+                (long long)(int)offsetof(struct mdt_body, t_state));
+       LASSERTF((int)sizeof(((struct mdt_body *)0)->t_state) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct mdt_body *)0)->t_state));
        LASSERTF((int)offsetof(struct mdt_body, fsuid) == 104, "found %lld\n",
                 (long long)(int)offsetof(struct mdt_body, fsuid));
        LASSERTF((int)sizeof(((struct mdt_body *)0)->fsuid) == 4, "found %lld\n",
@@ -4431,6 +4439,46 @@ void lustre_assert_wire_constants(void)
        LASSERTF((int)sizeof(((struct hsm_user_request *)0)->hur_user_item) == 0, "found %lld\n",
                 (long long)(int)sizeof(((struct hsm_user_request *)0)->hur_user_item));
 
+       /* Checks for struct hsm_user_import */
+       LASSERTF((int)sizeof(struct hsm_user_import) == 48, "found %lld\n",
+                (long long)(int)sizeof(struct hsm_user_import));
+       LASSERTF((int)offsetof(struct hsm_user_import, hui_size) == 0, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_user_import, hui_size));
+       LASSERTF((int)sizeof(((struct hsm_user_import *)0)->hui_size) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_user_import *)0)->hui_size));
+       LASSERTF((int)offsetof(struct hsm_user_import, hui_uid) == 32, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_user_import, hui_uid));
+       LASSERTF((int)sizeof(((struct hsm_user_import *)0)->hui_uid) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_user_import *)0)->hui_uid));
+       LASSERTF((int)offsetof(struct hsm_user_import, hui_gid) == 36, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_user_import, hui_gid));
+       LASSERTF((int)sizeof(((struct hsm_user_import *)0)->hui_gid) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_user_import *)0)->hui_gid));
+       LASSERTF((int)offsetof(struct hsm_user_import, hui_mode) == 40, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_user_import, hui_mode));
+       LASSERTF((int)sizeof(((struct hsm_user_import *)0)->hui_mode) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_user_import *)0)->hui_mode));
+       LASSERTF((int)offsetof(struct hsm_user_import, hui_atime) == 8, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_user_import, hui_atime));
+       LASSERTF((int)sizeof(((struct hsm_user_import *)0)->hui_atime) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_user_import *)0)->hui_atime));
+       LASSERTF((int)offsetof(struct hsm_user_import, hui_atime_ns) == 24, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_user_import, hui_atime_ns));
+       LASSERTF((int)sizeof(((struct hsm_user_import *)0)->hui_atime_ns) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_user_import *)0)->hui_atime_ns));
+       LASSERTF((int)offsetof(struct hsm_user_import, hui_mtime) == 16, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_user_import, hui_mtime));
+       LASSERTF((int)sizeof(((struct hsm_user_import *)0)->hui_mtime) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_user_import *)0)->hui_mtime));
+       LASSERTF((int)offsetof(struct hsm_user_import, hui_mtime_ns) == 28, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_user_import, hui_mtime_ns));
+       LASSERTF((int)sizeof(((struct hsm_user_import *)0)->hui_mtime_ns) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_user_import *)0)->hui_mtime_ns));
+       LASSERTF((int)offsetof(struct hsm_user_import, hui_archive_id) == 44, "found %lld\n",
+                (long long)(int)offsetof(struct hsm_user_import, hui_archive_id));
+       LASSERTF((int)sizeof(((struct hsm_user_import *)0)->hui_archive_id) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct hsm_user_import *)0)->hui_archive_id));
+
        /* Checks for struct update_buf */
        LASSERTF((int)sizeof(struct update_buf) == 8, "found %lld\n",
                 (long long)(int)sizeof(struct update_buf));