smash the HEAD with the contents of b_cmd. HEAD_PRE_CMD_SMASH and

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

diff --git a/lustre/ptlrpc/pack_generic.c b/lustre/ptlrpc/pack_generic.c
index 94475ee..3a74d41 100644 (file)
--- a/lustre/ptlrpc/pack_generic.c
+++ b/lustre/ptlrpc/pack_generic.c
@@ -27,7 +27,7 @@
 
 #define DEBUG_SUBSYSTEM S_RPC
 #ifndef __KERNEL__
-# include <liblustre.h>
+#include <liblustre.h>
 #endif
 
 #include <linux/obd_support.h>
@@ -671,7 +671,7 @@ void lustre_assert_wire_constants(void)
          * running on Linux schnapps.adilger.int 2.4.22-l32 #4 Thu Jan 8 14:32:57 MST 2004 i686 i686 
          * with gcc version 3.2.2 20030222 (Red Hat Linux 3.2.2-5) */
 
-
+#if 0
         /* Constants... */
         LASSERTF(PTLRPC_MSG_MAGIC == 0x0BD00BD0," found %lld\n",
                  (long long)PTLRPC_MSG_MAGIC);
@@ -775,7 +775,7 @@ void lustre_assert_wire_constants(void)
                  (long long)REINT_RENAME);
         LASSERTF(REINT_OPEN == 6, " found %lld\n",
                  (long long)REINT_OPEN);
-        LASSERTF(REINT_MAX == 8, " found %lld\n",
+        LASSERTF(REINT_MAX == 6, " found %lld\n",
                  (long long)REINT_MAX);
         LASSERTF(DISP_IT_EXECD == 1, " found %lld\n",
                  (long long)DISP_IT_EXECD);
@@ -909,7 +909,7 @@ void lustre_assert_wire_constants(void)
                  (long long)(int)sizeof(((struct lustre_msg *)0)->buflens[7]));
 
         /* Checks for struct obdo */
-        LASSERTF((int)sizeof(struct obdo) == 168, " found %lld\n",
+        LASSERTF((int)sizeof(struct obdo) == 172, " found %lld\n",
                  (long long)(int)sizeof(struct obdo));
         LASSERTF(offsetof(struct obdo, o_id) == 0, " found %lld\n",
                  (long long)offsetof(struct obdo, o_id));
@@ -983,7 +983,7 @@ void lustre_assert_wire_constants(void)
                  (long long)offsetof(struct obdo, o_easize));
         LASSERTF((int)sizeof(((struct obdo *)0)->o_easize) == 4, " found %lld\n",
                  (long long)(int)sizeof(((struct obdo *)0)->o_easize));
-        LASSERTF(offsetof(struct obdo, o_inline) == 104, " found %lld\n",
+        LASSERTF(offsetof(struct obdo, o_inline) == 108, " found %lld\n",
                  (long long)offsetof(struct obdo, o_inline));
         LASSERTF((int)sizeof(((struct obdo *)0)->o_inline) == 64, " found %lld\n",
                  (long long)(int)sizeof(((struct obdo *)0)->o_inline));
@@ -1193,15 +1193,15 @@ void lustre_assert_wire_constants(void)
                  (long long)OBD_BRW_FROM_GRANT);
 
         /* Checks for struct ost_body */
-        LASSERTF((int)sizeof(struct ost_body) == 168, " found %lld\n",
+        LASSERTF((int)sizeof(struct ost_body) == 172, " found %lld\n",
                  (long long)(int)sizeof(struct ost_body));
         LASSERTF(offsetof(struct ost_body, oa) == 0, " found %lld\n",
                  (long long)offsetof(struct ost_body, oa));
-        LASSERTF((int)sizeof(((struct ost_body *)0)->oa) == 168, " found %lld\n",
+        LASSERTF((int)sizeof(((struct ost_body *)0)->oa) == 172, " found %lld\n",
                  (long long)(int)sizeof(((struct ost_body *)0)->oa));
 
         /* Checks for struct ll_fid */
-        LASSERTF((int)sizeof(struct ll_fid) == 16, " found %lld\n",
+        LASSERTF((int)sizeof(struct ll_fid) == 24, " found %lld\n",
                  (long long)(int)sizeof(struct ll_fid));
         LASSERTF(offsetof(struct ll_fid, id) == 0, " found %lld\n",
                  (long long)offsetof(struct ll_fid, id));
@@ -1229,17 +1229,17 @@ void lustre_assert_wire_constants(void)
                  (long long)(int)sizeof(((struct mds_status_req *)0)->repbuf));
 
         /* Checks for struct mds_body */
-        LASSERTF((int)sizeof(struct mds_body) == 136, " found %lld\n",
+        LASSERTF((int)sizeof(struct mds_body) == 152, " found %lld\n",
                  (long long)(int)sizeof(struct mds_body));
         LASSERTF(offsetof(struct mds_body, fid1) == 0, " found %lld\n",
                  (long long)offsetof(struct mds_body, fid1));
-        LASSERTF((int)sizeof(((struct mds_body *)0)->fid1) == 16, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mds_body *)0)->fid1) == 24, " found %lld\n",
                  (long long)(int)sizeof(((struct mds_body *)0)->fid1));
-        LASSERTF(offsetof(struct mds_body, fid2) == 16, " found %lld\n",
+        LASSERTF(offsetof(struct mds_body, fid2) == 24, " found %lld\n",
                  (long long)offsetof(struct mds_body, fid2));
-        LASSERTF((int)sizeof(((struct mds_body *)0)->fid2) == 16, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mds_body *)0)->fid2) == 24, " found %lld\n",
                  (long long)(int)sizeof(((struct mds_body *)0)->fid2));
-        LASSERTF(offsetof(struct mds_body, handle) == 32, " found %lld\n",
+        LASSERTF(offsetof(struct mds_body, handle) == 48, " found %lld\n",
                  (long long)offsetof(struct mds_body, handle));
         LASSERTF((int)sizeof(((struct mds_body *)0)->handle) == 8, " found %lld\n",
                  (long long)(int)sizeof(((struct mds_body *)0)->handle));
@@ -2139,5 +2139,6 @@ void lustre_assert_wire_constants(void)
                  (long long)offsetof(struct llogd_conn_body, lgdc_ctxt_idx));
         LASSERTF((int)sizeof(((struct llogd_conn_body *)0)->lgdc_ctxt_idx) == 4, " found %lld\n",
                  (long long)(int)sizeof(((struct llogd_conn_body *)0)->lgdc_ctxt_idx));
+#endif
 }