Landing b_bug974 onto HEAD (20040213_1538).

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

diff --git a/lustre/ptlrpc/pack_generic.c b/lustre/ptlrpc/pack_generic.c
index e0e725a..d29fe39 100644 (file)
--- a/lustre/ptlrpc/pack_generic.c
+++ b/lustre/ptlrpc/pack_generic.c
@@ -306,7 +306,7 @@ void lustre_swab_obdo (struct obdo  *o)
         __swab64s (&o->o_ctime);
         __swab64s (&o->o_size);
         __swab64s (&o->o_blocks);
-        __swab64s (&o->o_rdev);
+        __swab64s (&o->o_grant);
         __swab32s (&o->o_blksize);
         __swab32s (&o->o_mode);
         __swab32s (&o->o_uid);
@@ -315,7 +315,7 @@ void lustre_swab_obdo (struct obdo  *o)
         __swab32s (&o->o_nlink);
         __swab32s (&o->o_generation);
         __swab32s (&o->o_valid);
-        __swab32s (&o->o_obdflags);
+        __swab32s (&o->o_misc);
         __swab32s (&o->o_easize);
         /* o_inline is opaque */
 }
@@ -615,7 +615,7 @@ void lustre_swab_llogd_conn_body (struct llogd_conn_body *d)
 void lustre_assert_wire_constants(void)
 {
         /* Wire protocol assertions generated by 'wirecheck'
-         * running on Linux schnapps.adilger.int 2.4.22-l32 #4 Thu Jan 8 14:32:57 MST 2004 i686 i686
+         * 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) */
 
 
@@ -756,8 +756,8 @@ void lustre_assert_wire_constants(void)
         LASSERT((int)sizeof(((struct obdo *)0)->o_size) == 8);
         LASSERT(offsetof(struct obdo, o_blocks) == 48);
         LASSERT((int)sizeof(((struct obdo *)0)->o_blocks) == 8);
-        LASSERT(offsetof(struct obdo, o_rdev) == 56);
-        LASSERT((int)sizeof(((struct obdo *)0)->o_rdev) == 8);
+        LASSERT(offsetof(struct obdo, o_grant) == 56);
+        LASSERT((int)sizeof(((struct obdo *)0)->o_grant) == 8);
         LASSERT(offsetof(struct obdo, o_blksize) == 64);
         LASSERT((int)sizeof(((struct obdo *)0)->o_blksize) == 4);
         LASSERT(offsetof(struct obdo, o_mode) == 68);
@@ -774,8 +774,8 @@ void lustre_assert_wire_constants(void)
         LASSERT((int)sizeof(((struct obdo *)0)->o_generation) == 4);
         LASSERT(offsetof(struct obdo, o_valid) == 92);
         LASSERT((int)sizeof(((struct obdo *)0)->o_valid) == 4);
-        LASSERT(offsetof(struct obdo, o_obdflags) == 96);
-        LASSERT((int)sizeof(((struct obdo *)0)->o_obdflags) == 4);
+        LASSERT(offsetof(struct obdo, o_misc) == 96);
+        LASSERT((int)sizeof(((struct obdo *)0)->o_misc) == 4);
         LASSERT(offsetof(struct obdo, o_easize) == 100);
         LASSERT((int)sizeof(((struct obdo *)0)->o_easize) == 4);
         LASSERT(offsetof(struct obdo, o_inline) == 104);
@@ -792,7 +792,6 @@ void lustre_assert_wire_constants(void)
         LASSERT(OBD_MD_FLUID == 512);
         LASSERT(OBD_MD_FLGID == 1024);
         LASSERT(OBD_MD_FLFLAGS == 2048);
-        LASSERT(OBD_MD_FLOBDFLG == 4096);
         LASSERT(OBD_MD_FLNLINK == 8192);
         LASSERT(OBD_MD_FLGENER == 16384);
         LASSERT(OBD_MD_FLINLINE == 32768);
@@ -810,6 +809,7 @@ void lustre_assert_wire_constants(void)
         LASSERT(OBD_FL_DELORPHAN == 4);
         LASSERT(OBD_FL_NORPC == 8);
         LASSERT(OBD_FL_IDONLY == 16);
+        LASSERT(OBD_FL_RECREATE_OBJS == 32);
 
         /* Checks for struct lov_mds_md_v1 */
         LASSERT((int)sizeof(struct lov_mds_md_v1) == 32);
@@ -885,7 +885,6 @@ void lustre_assert_wire_constants(void)
         LASSERT((int)sizeof(((struct niobuf_remote *)0)->flags) == 4);
         LASSERT(OBD_BRW_READ == 1);
         LASSERT(OBD_BRW_WRITE == 2);
-        LASSERT(OBD_BRW_CREATE == 4);
         LASSERT(OBD_BRW_SYNC == 8);
         LASSERT(OBD_BRW_FROM_GRANT == 32);