Whamcloud - gitweb
git://git.whamcloud.com / fs / lustre-release.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c57bb74)
LU-16 idl: fix obd_connect_data padding comments
authorAndreas Dilger <adilger@whamcloud.com>
Thu, 29 Sep 2011 23:48:51 +0000 (17:48 -0600)
committerOleg Drokin <green@whamcloud.com>
Mon, 12 Dec 2011 18:04:57 +0000 (13:04 -0500)
Fix incorrect comments about 2.2 addition new padding fields
in obd_connect_data, since this was landed in 2.1 after all.
This doesn't really affect 2.1, since it is self-evident that
those fields are in 2.1, but may be relevant in future releases.

Add these new fields to wiretest/wirecheck as well.

Signed-off-by: Andreas Dilger <adilger@whamcloud.com>
Change-Id: I0508934629dd028371211453c405b9c0a7cc9880
Reviewed-on: http://review.whamcloud.com/1447
Tested-by: Hudson
Reviewed-by: Fan Yong <yong.fan@whamcloud.com>
Tested-by: Maloo <whamcloud.maloo@gmail.com>
lustre/include/lustre/lustre_idl.h patch | blob | history
lustre/ptlrpc/wiretest.c patch | blob | history
lustre/utils/wirecheck.c patch | blob | history
lustre/utils/wiretest.c patch | blob | history

diff --git a/lustre/include/lustre/lustre_idl.h b/lustre/include/lustre/lustre_idl.h
index 01bd83b..9bb4bbf 100644 (file)
--- a/lustre/include/lustre/lustre_idl.h
+++ b/lustre/include/lustre/lustre_idl.h
@@ -1197,21 +1197,21 @@ struct obd_connect_data {
          * if the corresponding flag in ocd_connect_flags is set. Accessing
          * any field after ocd_maxbytes on the receiver without a valid flag
          * may result in out-of-bound memory access and kernel oops. */
-        __u64 padding1;          /* added 2.2.0. also fix lustre_swab_connect */
-        __u64 padding2;          /* added 2.2.0. also fix lustre_swab_connect */
-        __u64 padding3;          /* added 2.2.0. also fix lustre_swab_connect */
-        __u64 padding4;          /* added 2.2.0. also fix lustre_swab_connect */
-        __u64 padding5;          /* added 2.2.0. also fix lustre_swab_connect */
-        __u64 padding6;          /* added 2.2.0. also fix lustre_swab_connect */
-        __u64 padding7;          /* added 2.2.0. also fix lustre_swab_connect */
-        __u64 padding8;          /* added 2.2.0. also fix lustre_swab_connect */
-        __u64 padding9;          /* added 2.2.0. also fix lustre_swab_connect */
-        __u64 paddingA;          /* added 2.2.0. also fix lustre_swab_connect */
-        __u64 paddingB;          /* added 2.2.0. also fix lustre_swab_connect */
-        __u64 paddingC;          /* added 2.2.0. also fix lustre_swab_connect */
-        __u64 paddingD;          /* added 2.2.0. also fix lustre_swab_connect */
-        __u64 paddingE;          /* added 2.2.0. also fix lustre_swab_connect */
-        __u64 paddingF;          /* added 2.2.0. also fix lustre_swab_connect */
+        __u64 padding1;          /* added 2.1.0. also fix lustre_swab_connect */
+        __u64 padding2;          /* added 2.1.0. also fix lustre_swab_connect */
+        __u64 padding3;          /* added 2.1.0. also fix lustre_swab_connect */
+        __u64 padding4;          /* added 2.1.0. also fix lustre_swab_connect */
+        __u64 padding5;          /* added 2.1.0. also fix lustre_swab_connect */
+        __u64 padding6;          /* added 2.1.0. also fix lustre_swab_connect */
+        __u64 padding7;          /* added 2.1.0. also fix lustre_swab_connect */
+        __u64 padding8;          /* added 2.1.0. also fix lustre_swab_connect */
+        __u64 padding9;          /* added 2.1.0. also fix lustre_swab_connect */
+        __u64 paddingA;          /* added 2.1.0. also fix lustre_swab_connect */
+        __u64 paddingB;          /* added 2.1.0. also fix lustre_swab_connect */
+        __u64 paddingC;          /* added 2.1.0. also fix lustre_swab_connect */
+        __u64 paddingD;          /* added 2.1.0. also fix lustre_swab_connect */
+        __u64 paddingE;          /* added 2.1.0. also fix lustre_swab_connect */
+        __u64 paddingF;          /* added 2.1.0. also fix lustre_swab_connect */
 };
 
 
diff --git a/lustre/ptlrpc/wiretest.c b/lustre/ptlrpc/wiretest.c
index 2b32ec4..b76757d 100644 (file)
--- a/lustre/ptlrpc/wiretest.c
+++ b/lustre/ptlrpc/wiretest.c
@@ -847,6 +847,57 @@ void lustre_assert_wire_constants(void)
                  (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, padding3) == 88, "found %lld\n",
+                 (long long)(int)offsetof(struct obd_connect_data, padding3));
+        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->padding3) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct obd_connect_data *)0)->padding3));
+        LASSERTF((int)offsetof(struct obd_connect_data, padding4) == 96, "found %lld\n",
+                 (long long)(int)offsetof(struct obd_connect_data, padding4));
+        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->padding4) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct obd_connect_data *)0)->padding4));
+        LASSERTF((int)offsetof(struct obd_connect_data, padding5) == 104, "found %lld\n",
+                 (long long)(int)offsetof(struct obd_connect_data, padding5));
+        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->padding5) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct obd_connect_data *)0)->padding5));
+        LASSERTF((int)offsetof(struct obd_connect_data, padding6) == 112, "found %lld\n",
+                 (long long)(int)offsetof(struct obd_connect_data, padding6));
+        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->padding6) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct obd_connect_data *)0)->padding6));
+        LASSERTF((int)offsetof(struct obd_connect_data, padding7) == 120, "found %lld\n",
+                 (long long)(int)offsetof(struct obd_connect_data, padding7));
+        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->padding7) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct obd_connect_data *)0)->padding7));
+        LASSERTF((int)offsetof(struct obd_connect_data, padding8) == 128, "found %lld\n",
+                 (long long)(int)offsetof(struct obd_connect_data, padding8));
+        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->padding8) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct obd_connect_data *)0)->padding8));
+        LASSERTF((int)offsetof(struct obd_connect_data, padding9) == 136, "found %lld\n",
+                 (long long)(int)offsetof(struct obd_connect_data, padding9));
+        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->padding9) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct obd_connect_data *)0)->padding9));
+        LASSERTF((int)offsetof(struct obd_connect_data, paddingA) == 144, "found %lld\n",
+                 (long long)(int)offsetof(struct obd_connect_data, paddingA));
+        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->paddingA) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct obd_connect_data *)0)->paddingA));
+        LASSERTF((int)offsetof(struct obd_connect_data, paddingB) == 152, "found %lld\n",
+                 (long long)(int)offsetof(struct obd_connect_data, paddingB));
+        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->paddingB) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct obd_connect_data *)0)->paddingB));
+        LASSERTF((int)offsetof(struct obd_connect_data, paddingC) == 160, "found %lld\n",
+                 (long long)(int)offsetof(struct obd_connect_data, paddingC));
+        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->paddingC) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct obd_connect_data *)0)->paddingC));
+        LASSERTF((int)offsetof(struct obd_connect_data, paddingD) == 168, "found %lld\n",
+                 (long long)(int)offsetof(struct obd_connect_data, paddingD));
+        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->paddingD) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct obd_connect_data *)0)->paddingD));
+        LASSERTF((int)offsetof(struct obd_connect_data, paddingE) == 176, "found %lld\n",
+                 (long long)(int)offsetof(struct obd_connect_data, paddingE));
+        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->paddingE) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct obd_connect_data *)0)->paddingE));
+        LASSERTF((int)offsetof(struct obd_connect_data, paddingF) == 184, "found %lld\n",
+                 (long long)(int)sizeof(((struct obd_connect_data *)0)->paddingF));
+
         LASSERTF(OBD_CONNECT_RDONLY == 0x1ULL, "found 0x%.16llxULL\n",
                  OBD_CONNECT_RDONLY);
         LASSERTF(OBD_CONNECT_INDEX == 0x2ULL, "found 0x%.16llxULL\n",
diff --git a/lustre/utils/wirecheck.c b/lustre/utils/wirecheck.c
index fc2f3bb..e61faef 100644 (file)
--- a/lustre/utils/wirecheck.c
+++ b/lustre/utils/wirecheck.c
@@ -388,6 +388,19 @@ check_obd_connect_data(void)
         CHECK_MEMBER(obd_connect_data, ocd_maxbytes);
         CHECK_MEMBER(obd_connect_data, padding1);
         CHECK_MEMBER(obd_connect_data, padding2);
+        CHECK_MEMBER(obd_connect_data, padding3);
+        CHECK_MEMBER(obd_connect_data, padding4);
+        CHECK_MEMBER(obd_connect_data, padding5);
+        CHECK_MEMBER(obd_connect_data, padding6);
+        CHECK_MEMBER(obd_connect_data, padding7);
+        CHECK_MEMBER(obd_connect_data, padding8);
+        CHECK_MEMBER(obd_connect_data, padding9);
+        CHECK_MEMBER(obd_connect_data, paddingA);
+        CHECK_MEMBER(obd_connect_data, paddingB);
+        CHECK_MEMBER(obd_connect_data, paddingC);
+        CHECK_MEMBER(obd_connect_data, paddingD);
+        CHECK_MEMBER(obd_connect_data, paddingE);
+        CHECK_MEMBER(obd_connect_data, paddingF);
 
         CHECK_DEFINE_64X(OBD_CONNECT_RDONLY);
         CHECK_DEFINE_64X(OBD_CONNECT_INDEX);
diff --git a/lustre/utils/wiretest.c b/lustre/utils/wiretest.c
index de96358..aea1297 100644 (file)
--- a/lustre/utils/wiretest.c
+++ b/lustre/utils/wiretest.c
@@ -844,6 +844,57 @@ void lustre_assert_wire_constants(void)
                  (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, padding3) == 88, "found %lld\n",
+                 (long long)(int)offsetof(struct obd_connect_data, padding3));
+        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->padding3) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct obd_connect_data *)0)->padding3));
+        LASSERTF((int)offsetof(struct obd_connect_data, padding4) == 96, "found %lld\n",
+                 (long long)(int)offsetof(struct obd_connect_data, padding4));
+        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->padding4) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct obd_connect_data *)0)->padding4));
+        LASSERTF((int)offsetof(struct obd_connect_data, padding5) == 104, "found %lld\n",
+                 (long long)(int)offsetof(struct obd_connect_data, padding5));
+        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->padding5) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct obd_connect_data *)0)->padding5));
+        LASSERTF((int)offsetof(struct obd_connect_data, padding6) == 112, "found %lld\n",
+                 (long long)(int)offsetof(struct obd_connect_data, padding6));
+        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->padding6) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct obd_connect_data *)0)->padding6));
+        LASSERTF((int)offsetof(struct obd_connect_data, padding7) == 120, "found %lld\n",
+                 (long long)(int)offsetof(struct obd_connect_data, padding7));
+        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->padding7) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct obd_connect_data *)0)->padding7));
+        LASSERTF((int)offsetof(struct obd_connect_data, padding8) == 128, "found %lld\n",
+                 (long long)(int)offsetof(struct obd_connect_data, padding8));
+        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->padding8) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct obd_connect_data *)0)->padding8));
+        LASSERTF((int)offsetof(struct obd_connect_data, padding9) == 136, "found %lld\n",
+                 (long long)(int)offsetof(struct obd_connect_data, padding9));
+        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->padding9) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct obd_connect_data *)0)->padding9));
+        LASSERTF((int)offsetof(struct obd_connect_data, paddingA) == 144, "found %lld\n",
+                 (long long)(int)offsetof(struct obd_connect_data, paddingA));
+        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->paddingA) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct obd_connect_data *)0)->paddingA));
+        LASSERTF((int)offsetof(struct obd_connect_data, paddingB) == 152, "found %lld\n",
+                 (long long)(int)offsetof(struct obd_connect_data, paddingB));
+        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->paddingB) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct obd_connect_data *)0)->paddingB));
+        LASSERTF((int)offsetof(struct obd_connect_data, paddingC) == 160, "found %lld\n",
+                 (long long)(int)offsetof(struct obd_connect_data, paddingC));
+        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->paddingC) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct obd_connect_data *)0)->paddingC));
+        LASSERTF((int)offsetof(struct obd_connect_data, paddingD) == 168, "found %lld\n",
+                 (long long)(int)offsetof(struct obd_connect_data, paddingD));
+        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->paddingD) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct obd_connect_data *)0)->paddingD));
+        LASSERTF((int)offsetof(struct obd_connect_data, paddingE) == 176, "found %lld\n",
+                 (long long)(int)offsetof(struct obd_connect_data, paddingE));
+        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->paddingE) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct obd_connect_data *)0)->paddingE));
+        LASSERTF((int)offsetof(struct obd_connect_data, paddingF) == 184, "found %lld\n",
+                 (long long)(int)sizeof(((struct obd_connect_data *)0)->paddingF));
+
         LASSERTF(OBD_CONNECT_RDONLY == 0x1ULL, "found 0x%.16llxULL\n",
                  OBD_CONNECT_RDONLY);
         LASSERTF(OBD_CONNECT_INDEX == 0x2ULL, "found 0x%.16llxULL\n",
Lustre primary development and releases