Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml

[~andy/linux] / drivers / staging / lustre / lustre / ptlrpc / wiretest.c

diff --git a/drivers/staging/lustre/lustre/ptlrpc/wiretest.c b/drivers/staging/lustre/lustre/ptlrpc/wiretest.c
index 9890bd9cfb93ae7f150da6ad6f90e414b9c72e56..3aa445952024aa9fd44f9569ce588da180883e6a 100644 (file)
--- a/drivers/staging/lustre/lustre/ptlrpc/wiretest.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/wiretest.c
@@ -36,10 +36,8 @@
 
 #define DEBUG_SUBSYSTEM S_RPC
 
-# ifdef CONFIG_FS_POSIX_ACL
-#  include <linux/fs.h>
-#  include <linux/posix_acl_xattr.h>
-# endif
+#include <linux/fs.h>
+#include <linux/posix_acl_xattr.h>
 
 #include <obd_support.h>
 #include <obd_class.h>
@@ -49,9 +47,10 @@ 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... */
        LASSERTF(PTL_RPC_MSG_REQUEST == 4711, "found %lld\n",
@@ -432,6 +431,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",
@@ -1335,6 +1338,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",
@@ -1918,10 +1923,11 @@ 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",
@@ -4416,6 +4422,64 @@ 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(sizeof(struct hsm_user_import) == 48, "found %lld\n",
+                (long long)sizeof(struct hsm_user_import));
+       LASSERTF(offsetof(struct hsm_user_import, hui_size) == 0,
+                "found %lld\n",
+                (long long)offsetof(struct hsm_user_import, hui_size));
+       LASSERTF(sizeof(((struct hsm_user_import *)0)->hui_size) == 8,
+                "found %lld\n",
+                (long long)sizeof(((struct hsm_user_import *)0)->hui_size));
+       LASSERTF(offsetof(struct hsm_user_import, hui_uid) == 32,
+                "found %lld\n",
+                (long long)offsetof(struct hsm_user_import, hui_uid));
+       LASSERTF(sizeof(((struct hsm_user_import *)0)->hui_uid) == 4,
+                "found %lld\n",
+                (long long)sizeof(((struct hsm_user_import *)0)->hui_uid));
+       LASSERTF(offsetof(struct hsm_user_import, hui_gid) == 36,
+                "found %lld\n",
+                (long long)offsetof(struct hsm_user_import, hui_gid));
+       LASSERTF(sizeof(((struct hsm_user_import *)0)->hui_gid) == 4,
+                "found %lld\n",
+                (long long)sizeof(((struct hsm_user_import *)0)->hui_gid));
+       LASSERTF(offsetof(struct hsm_user_import, hui_mode) == 40,
+                "found %lld\n",
+                (long long)offsetof(struct hsm_user_import, hui_mode));
+       LASSERTF(sizeof(((struct hsm_user_import *)0)->hui_mode) == 4,
+                "found %lld\n",
+                (long long)sizeof(((struct hsm_user_import *)0)->hui_mode));
+       LASSERTF(offsetof(struct hsm_user_import, hui_atime) == 8,
+                "found %lld\n",
+                (long long)offsetof(struct hsm_user_import, hui_atime));
+       LASSERTF(sizeof(((struct hsm_user_import *)0)->hui_atime) == 8,
+                "found %lld\n",
+                (long long)sizeof(((struct hsm_user_import *)0)->hui_atime));
+       LASSERTF(offsetof(struct hsm_user_import, hui_atime_ns) == 24,
+                "found %lld\n",
+               (long long)(int)offsetof(struct hsm_user_import, hui_atime_ns));
+       LASSERTF(sizeof(((struct hsm_user_import *)0)->hui_atime_ns) == 4,
+                "found %lld\n",
+               (long long)sizeof(((struct hsm_user_import *)0)->hui_atime_ns));
+       LASSERTF(offsetof(struct hsm_user_import, hui_mtime) == 16,
+                "found %lld\n",
+                (long long)offsetof(struct hsm_user_import, hui_mtime));
+       LASSERTF(sizeof(((struct hsm_user_import *)0)->hui_mtime) == 8,
+                "found %lld\n",
+                (long long)sizeof(((struct hsm_user_import *)0)->hui_mtime));
+       LASSERTF(offsetof(struct hsm_user_import, hui_mtime_ns) == 28,
+                "found %lld\n",
+               (long long)offsetof(struct hsm_user_import, hui_mtime_ns));
+       LASSERTF(sizeof(((struct hsm_user_import *)0)->hui_mtime_ns) == 4,
+                "found %lld\n",
+               (long long)sizeof(((struct hsm_user_import *)0)->hui_mtime_ns));
+       LASSERTF(offsetof(struct hsm_user_import, hui_archive_id) == 44,
+                "found %lld\n",
+                (long long)offsetof(struct hsm_user_import, hui_archive_id));
+       LASSERTF(sizeof(((struct hsm_user_import *)0)->hui_archive_id) == 4,
+                "found %lld\n",
+             (long long)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));