From: Nicolas Williams Date: Wed, 9 Jun 2010 19:58:32 +0000 (-0500) Subject: b=23023 wirecheck.c / newwiretest don't build X-Git-Tag: v1_10_0_44~16 X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=6d34d2b7920ff3cbc8a4442bc39285e6ddb71236 b=23023 wirecheck.c / newwiretest don't build wirecheck.c needed an update following b19427. Several *_ogr struct fields became *_oseq. i=andreas.dilger@oracle.com --- diff --git a/lustre/ptlrpc/wiretest.c b/lustre/ptlrpc/wiretest.c index 4a8a879..ed20943 100644 --- a/lustre/ptlrpc/wiretest.c +++ b/lustre/ptlrpc/wiretest.c @@ -65,7 +65,7 @@ void lustre_assert_wire_constants(void) { /* Wire protocol assertions generated by 'wirecheck' * (make -C lustre/utils newwiretest) - * running on Linux vl1 2.6.18-prep #2 SMP Wed Jul 22 20:53:11 CDT 2009 x86_64 x86_64 x86_64 + * running on Linux vl1 2.6.18-prep #3 SMP Mon Apr 19 06:11:00 CDT 2010 x86_64 x86_64 x86_64 * with gcc version 4.1.2 20070626 (Red Hat 4.1.2-14) */ @@ -501,14 +501,14 @@ void lustre_assert_wire_constants(void) (long long)(int)offsetof(struct obdo, o_valid)); LASSERTF((int)sizeof(((struct obdo *)0)->o_valid) == 8, " found %lld\n", (long long)(int)sizeof(((struct obdo *)0)->o_valid)); - LASSERTF((int)offsetof(struct obdo, o_id) == 8, " found %lld\n", - (long long)(int)offsetof(struct obdo, o_id)); - LASSERTF((int)sizeof(((struct obdo *)0)->o_id) == 8, " found %lld\n", - (long long)(int)sizeof(((struct obdo *)0)->o_id)); - LASSERTF((int)offsetof(struct obdo, o_seq) == 16, " found %lld\n", - (long long)(int)offsetof(struct obdo, o_seq)); - LASSERTF((int)sizeof(((struct obdo *)0)->o_seq) == 8, " found %lld\n", - (long long)(int)sizeof(((struct obdo *)0)->o_seq)); + LASSERTF((int)offsetof(struct obdo, o_oi.oi_id) == 8, " found %lld\n", + (long long)(int)offsetof(struct obdo, o_oi.oi_id)); + LASSERTF((int)sizeof(((struct obdo *)0)->o_oi.oi_id) == 8, " found %lld\n", + (long long)(int)sizeof(((struct obdo *)0)->o_oi.oi_id)); + LASSERTF((int)offsetof(struct obdo, o_oi.oi_seq) == 16, " found %lld\n", + (long long)(int)offsetof(struct obdo, o_oi.oi_seq)); + LASSERTF((int)sizeof(((struct obdo *)0)->o_oi.oi_seq) == 8, " found %lld\n", + (long long)(int)sizeof(((struct obdo *)0)->o_oi.oi_seq)); LASSERTF((int)offsetof(struct obdo, o_parent_seq) == 24, " found %lld\n", (long long)(int)offsetof(struct obdo, o_parent_seq)); LASSERTF((int)sizeof(((struct obdo *)0)->o_parent_seq) == 8, " found %lld\n", @@ -2042,6 +2042,10 @@ void lustre_assert_wire_constants(void) (long long)(int)offsetof(struct llog_create_rec, padding)); LASSERTF((int)sizeof(((struct llog_create_rec *)0)->padding) == 4, " found %lld\n", (long long)(int)sizeof(((struct llog_create_rec *)0)->padding)); + LASSERTF((int)offsetof(struct llog_create_rec, lcr_tail) == 48, " found %lld\n", + (long long)(int)offsetof(struct llog_create_rec, lcr_tail)); + LASSERTF((int)sizeof(((struct llog_create_rec *)0)->lcr_tail) == 8, " found %lld\n", + (long long)(int)sizeof(((struct llog_create_rec *)0)->lcr_tail)); /* Checks for struct llog_orphan_rec */ LASSERTF((int)sizeof(struct llog_orphan_rec) == 40, " found %lld\n", diff --git a/lustre/utils/wirecheck.c b/lustre/utils/wirecheck.c index 107ad37..1af633e 100644 --- a/lustre/utils/wirecheck.c +++ b/lustre/utils/wirecheck.c @@ -903,8 +903,9 @@ check_llog_create_rec(void) CHECK_MEMBER(llog_create_rec, lcr_hdr); CHECK_MEMBER(llog_create_rec, lcr_fid); CHECK_MEMBER(llog_create_rec, lcr_oid); - CHECK_MEMBER(llog_create_rec, lcr_ogr); + CHECK_MEMBER(llog_create_rec, lcr_oseq); CHECK_MEMBER(llog_create_rec, padding); + CHECK_MEMBER(llog_create_rec, lcr_tail); } static void @@ -926,7 +927,7 @@ check_llog_unlink_rec(void) CHECK_STRUCT(llog_unlink_rec); CHECK_MEMBER(llog_unlink_rec, lur_hdr); CHECK_MEMBER(llog_unlink_rec, lur_oid); - CHECK_MEMBER(llog_unlink_rec, lur_ogr); + CHECK_MEMBER(llog_unlink_rec, lur_oseq); CHECK_MEMBER(llog_unlink_rec, lur_count); CHECK_MEMBER(llog_unlink_rec, lur_tail); } @@ -938,7 +939,7 @@ check_llog_setattr_rec(void) CHECK_STRUCT(llog_setattr_rec); CHECK_MEMBER(llog_setattr_rec, lsr_hdr); CHECK_MEMBER(llog_setattr_rec, lsr_oid); - CHECK_MEMBER(llog_setattr_rec, lsr_ogr); + CHECK_MEMBER(llog_setattr_rec, lsr_oseq); CHECK_MEMBER(llog_setattr_rec, lsr_uid); CHECK_MEMBER(llog_setattr_rec, lsr_gid); CHECK_MEMBER(llog_setattr_rec, padding); @@ -952,7 +953,7 @@ check_llog_setattr64_rec(void) CHECK_STRUCT(llog_setattr64_rec); CHECK_MEMBER(llog_setattr64_rec, lsr_hdr); CHECK_MEMBER(llog_setattr64_rec, lsr_oid); - CHECK_MEMBER(llog_setattr64_rec, lsr_ogr); + CHECK_MEMBER(llog_setattr64_rec, lsr_oseq); CHECK_MEMBER(llog_setattr64_rec, padding); CHECK_MEMBER(llog_setattr64_rec, lsr_uid); CHECK_MEMBER(llog_setattr64_rec, lsr_uid_h); diff --git a/lustre/utils/wiretest.c b/lustre/utils/wiretest.c index 883adbe..aac3c87 100644 --- a/lustre/utils/wiretest.c +++ b/lustre/utils/wiretest.c @@ -62,7 +62,7 @@ void lustre_assert_wire_constants(void) { /* Wire protocol assertions generated by 'wirecheck' * (make -C lustre/utils newwiretest) - * running on Linux vl1 2.6.18-prep #2 SMP Wed Jul 22 20:53:11 CDT 2009 x86_64 x86_64 x86_64 + * running on Linux vl1 2.6.18-prep #3 SMP Mon Apr 19 06:11:00 CDT 2010 x86_64 x86_64 x86_64 * with gcc version 4.1.2 20070626 (Red Hat 4.1.2-14) */ @@ -498,14 +498,14 @@ void lustre_assert_wire_constants(void) (long long)(int)offsetof(struct obdo, o_valid)); LASSERTF((int)sizeof(((struct obdo *)0)->o_valid) == 8, " found %lld\n", (long long)(int)sizeof(((struct obdo *)0)->o_valid)); - LASSERTF((int)offsetof(struct obdo, o_id) == 8, " found %lld\n", - (long long)(int)offsetof(struct obdo, o_id)); - LASSERTF((int)sizeof(((struct obdo *)0)->o_id) == 8, " found %lld\n", - (long long)(int)sizeof(((struct obdo *)0)->o_id)); - LASSERTF((int)offsetof(struct obdo, o_seq) == 16, " found %lld\n", - (long long)(int)offsetof(struct obdo, o_seq)); - LASSERTF((int)sizeof(((struct obdo *)0)->o_seq) == 8, " found %lld\n", - (long long)(int)sizeof(((struct obdo *)0)->o_seq)); + LASSERTF((int)offsetof(struct obdo, o_oi.oi_id) == 8, " found %lld\n", + (long long)(int)offsetof(struct obdo, o_oi.oi_id)); + LASSERTF((int)sizeof(((struct obdo *)0)->o_oi.oi_id) == 8, " found %lld\n", + (long long)(int)sizeof(((struct obdo *)0)->o_oi.oi_id)); + LASSERTF((int)offsetof(struct obdo, o_oi.oi_seq) == 16, " found %lld\n", + (long long)(int)offsetof(struct obdo, o_oi.oi_seq)); + LASSERTF((int)sizeof(((struct obdo *)0)->o_oi.oi_seq) == 8, " found %lld\n", + (long long)(int)sizeof(((struct obdo *)0)->o_oi.oi_seq)); LASSERTF((int)offsetof(struct obdo, o_parent_seq) == 24, " found %lld\n", (long long)(int)offsetof(struct obdo, o_parent_seq)); LASSERTF((int)sizeof(((struct obdo *)0)->o_parent_seq) == 8, " found %lld\n", @@ -2039,6 +2039,10 @@ void lustre_assert_wire_constants(void) (long long)(int)offsetof(struct llog_create_rec, padding)); LASSERTF((int)sizeof(((struct llog_create_rec *)0)->padding) == 4, " found %lld\n", (long long)(int)sizeof(((struct llog_create_rec *)0)->padding)); + LASSERTF((int)offsetof(struct llog_create_rec, lcr_tail) == 48, " found %lld\n", + (long long)(int)offsetof(struct llog_create_rec, lcr_tail)); + LASSERTF((int)sizeof(((struct llog_create_rec *)0)->lcr_tail) == 8, " found %lld\n", + (long long)(int)sizeof(((struct llog_create_rec *)0)->lcr_tail)); /* Checks for struct llog_orphan_rec */ LASSERTF((int)sizeof(struct llog_orphan_rec) == 40, " found %lld\n",