LU-406 Fix compile breakage after adding ocd_max_bytes

Update pack_generic and two wiretest.c files to know about padding
and ocd_max_bytes fields in ocd_connect_data

Signed-off-by: Oleg Drokin <green@whamcloud.com>
Change-Id: I3405b88cf170efa94ee4233f3ccfb86db527ed7c
Reviewed-on: http://review.whamcloud.com/932
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Johann Lombardi <johann@whamcloud.com>
Tested-by: Johann Lombardi <johann@whamcloud.com>

diff --git a/lustre/ptlrpc/pack_generic.c b/lustre/ptlrpc/pack_generic.c
index be3f0ae..0614292 100644 (file)
--- a/lustre/ptlrpc/pack_generic.c
+++ b/lustre/ptlrpc/pack_generic.c
@@ -1980,8 +1980,8 @@ void lustre_swab_connect(struct obd_connect_data *ocd)
         __swab32s(&ocd->ocd_group);
         __swab32s(&ocd->ocd_cksum_types);
         __swab32s(&ocd->ocd_max_easize);
-        CLASSERT(offsetof(typeof(*ocd), padding1) != 0);
-        CLASSERT(offsetof(typeof(*ocd), padding2) != 0);
+        __swab64s(&ocd->ocd_maxbytes);
+        CLASSERT(offsetof(typeof(*ocd), padding) != 0);
 }
 
 void lustre_swab_obdo (struct obdo  *o)

diff --git a/lustre/ptlrpc/wiretest.c b/lustre/ptlrpc/wiretest.c
index 36c8969..956ae1a 100644 (file)
--- a/lustre/ptlrpc/wiretest.c
+++ b/lustre/ptlrpc/wiretest.c
@@ -520,14 +520,14 @@ void lustre_assert_wire_constants(void)
                  (long long)(int)offsetof(struct obd_connect_data, ocd_max_easize));
         LASSERTF((int)sizeof(((struct obd_connect_data *)0)->ocd_max_easize) == 4, " found %lld\n",
                  (long long)(int)sizeof(((struct obd_connect_data *)0)->ocd_max_easize));
-        LASSERTF((int)offsetof(struct obd_connect_data, padding1) == 60, " found %lld\n",
-                 (long long)(int)offsetof(struct obd_connect_data, padding1));
-        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->padding1) == 4, " found %lld\n",
-                 (long long)(int)sizeof(((struct obd_connect_data *)0)->padding1));
-        LASSERTF((int)offsetof(struct obd_connect_data, padding2) == 64, " found %lld\n",
-                 (long long)(int)offsetof(struct obd_connect_data, padding2));
-        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->padding2) == 8, " found %lld\n",
-                 (long long)(int)sizeof(((struct obd_connect_data *)0)->padding2));
+        LASSERTF((int)offsetof(struct obd_connect_data, padding) == 60, " found %lld\n",
+                 (long long)(int)offsetof(struct obd_connect_data, padding));
+        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->padding) == 4, " found %lld\n",
+                 (long long)(int)sizeof(((struct obd_connect_data *)0)->padding));
+        LASSERTF((int)offsetof(struct obd_connect_data, ocd_maxbytes) == 64, " found %lld\n",
+                 (long long)(int)offsetof(struct obd_connect_data, ocd_maxbytes));
+        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->ocd_maxbytes) == 8, " found %lld\n",
+                 (long long)(int)sizeof(((struct obd_connect_data *)0)->ocd_maxbytes));
         CLASSERT(OBD_CONNECT_RDONLY == 0x1ULL);
         CLASSERT(OBD_CONNECT_INDEX == 0x2ULL);
         CLASSERT(OBD_CONNECT_GRANT == 0x8ULL);

diff --git a/lustre/utils/wiretest.c b/lustre/utils/wiretest.c
index c670c69..1a6b25a 100644 (file)
--- a/lustre/utils/wiretest.c
+++ b/lustre/utils/wiretest.c
@@ -518,14 +518,14 @@ void lustre_assert_wire_constants(void)
                  (long long)(int)offsetof(struct obd_connect_data, ocd_max_easize));
         LASSERTF((int)sizeof(((struct obd_connect_data *)0)->ocd_max_easize) == 4, " found %lld\n",
                  (long long)(int)sizeof(((struct obd_connect_data *)0)->ocd_max_easize));
-        LASSERTF((int)offsetof(struct obd_connect_data, padding1) == 60, " found %lld\n",
-                 (long long)(int)offsetof(struct obd_connect_data, padding1));
-        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->padding1) == 4, " found %lld\n",
-                 (long long)(int)sizeof(((struct obd_connect_data *)0)->padding1));
-        LASSERTF((int)offsetof(struct obd_connect_data, padding2) == 64, " found %lld\n",
-                 (long long)(int)offsetof(struct obd_connect_data, padding2));
-        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->padding2) == 8, " found %lld\n",
-                 (long long)(int)sizeof(((struct obd_connect_data *)0)->padding2));
+        LASSERTF((int)offsetof(struct obd_connect_data, padding) == 60, " found %lld\n",
+                 (long long)(int)offsetof(struct obd_connect_data, padding));
+        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->padding) == 4, " found %lld\n",
+                 (long long)(int)sizeof(((struct obd_connect_data *)0)->padding));
+        LASSERTF((int)offsetof(struct obd_connect_data, ocd_maxbytes) == 64, " found %lld\n",
+                 (long long)(int)offsetof(struct obd_connect_data, ocd_maxbytes));
+        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->ocd_maxbytes) == 8, " found %lld\n",
+                 (long long)(int)sizeof(((struct obd_connect_data *)0)->ocd_maxbytes));
         CLASSERT(OBD_CONNECT_RDONLY == 0x1ULL);
         CLASSERT(OBD_CONNECT_INDEX == 0x2ULL);
         CLASSERT(OBD_CONNECT_GRANT == 0x8ULL);