From: nasf Date: Sat, 4 Jun 2011 15:21:04 +0000 (+0800) Subject: LU-376 Cleanup wirecheck X-Git-Tag: v1_8_6_RC1~13 X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=83dae8a8d91f1f04bb89da4b0758229be6b03f19;p=fs%2Flustre-release.git LU-376 Cleanup wirecheck Drop unused ones and add 'MDS_DIR_END_OFF' check. Change-Id: I813a2963d9ce858386f3cfff8581536a2e46d981 Signed-off-by: nasf Reviewed-on: http://review.whamcloud.com/891 Tested-by: Hudson Reviewed-by: Andreas Dilger Reviewed-by: Johann Lombardi --- diff --git a/lustre/ptlrpc/wiretest.c b/lustre/ptlrpc/wiretest.c index 00ba531..36c8969 100644 --- a/lustre/ptlrpc/wiretest.c +++ b/lustre/ptlrpc/wiretest.c @@ -65,8 +65,8 @@ void lustre_assert_wire_constants(void) { /* Wire protocol assertions generated by 'wirecheck' * (make -C lustre/utils newwiretest) - * running on Linux localhost.localdomain 2.6.18-prep #3 SMP Sun Nov 23 08:04:44 EST 2008 i68 - * with gcc version 4.1.1 20061011 (Red Hat 4.1.1-30) */ + * running on Linux nasf 2.6.18-238.9.1 #1 SMP Fri May 20 21:07:56 CST 2011 i686 i686 i386 GN + * with gcc version 4.1.1 20070105 (Red Hat 4.1.1-52) */ /* Constants... */ @@ -720,24 +720,24 @@ void lustre_assert_wire_constants(void) CLASSERT(OBD_MD_FLXATTRLS == (0x0000002000000000ULL)); CLASSERT(OBD_MD_FLXATTRRM == (0x0000004000000000ULL)); CLASSERT(OBD_MD_FLACL == (0x0000008000000000ULL)); - CLASSERT(OBD_FL_INLINEDATA == (0x00000001)); - CLASSERT(OBD_FL_OBDMDEXISTS == (0x00000002)); - CLASSERT(OBD_FL_DELORPHAN == (0x00000004)); - CLASSERT(OBD_FL_NORPC == (0x00000008)); - CLASSERT(OBD_FL_IDONLY == (0x00000010)); - CLASSERT(OBD_FL_RECREATE_OBJS == (0x00000020)); - CLASSERT(OBD_FL_DEBUG_CHECK == (0x00000040)); - CLASSERT(OBD_FL_NO_USRQUOTA == (0x00000100)); - CLASSERT(OBD_FL_NO_GRPQUOTA == (0x00000200)); - CLASSERT(OBD_FL_CREATE_CROW == (0x00000400)); - CLASSERT(OBD_FL_TRUNCLOCK == (0x00000800)); - CLASSERT(OBD_FL_CKSUM_CRC32 == (0x00001000)); - CLASSERT(OBD_FL_CKSUM_ADLER == (0x00002000)); - CLASSERT(OBD_FL_SHRINK_GRANT == (0x00020000)); - CLASSERT(OBD_FL_MMAP == (0x00040000)); - CLASSERT(OBD_FL_RECOV_RESEND == (0x00080000)); - CLASSERT(OBD_CKSUM_CRC32 == 1); - CLASSERT(OBD_CKSUM_ADLER == 2); + CLASSERT(OBD_FL_INLINEDATA == 0x00000001); + CLASSERT(OBD_FL_OBDMDEXISTS == 0x00000002); + CLASSERT(OBD_FL_DELORPHAN == 0x00000004); + CLASSERT(OBD_FL_NORPC == 0x00000008); + CLASSERT(OBD_FL_IDONLY == 0x00000010); + CLASSERT(OBD_FL_RECREATE_OBJS == 0x00000020); + CLASSERT(OBD_FL_DEBUG_CHECK == 0x00000040); + CLASSERT(OBD_FL_NO_USRQUOTA == 0x00000100); + CLASSERT(OBD_FL_NO_GRPQUOTA == 0x00000200); + CLASSERT(OBD_FL_CREATE_CROW == 0x00000400); + CLASSERT(OBD_FL_TRUNCLOCK == 0x00000800); + CLASSERT(OBD_FL_CKSUM_CRC32 == 0x00001000); + CLASSERT(OBD_FL_CKSUM_ADLER == 0x00002000); + CLASSERT(OBD_FL_SHRINK_GRANT == 0x00020000); + CLASSERT(OBD_FL_MMAP == 0x00040000); + CLASSERT(OBD_FL_RECOV_RESEND == 0x00080000); + CLASSERT(OBD_CKSUM_CRC32 == 0x00000001); + CLASSERT(OBD_CKSUM_ADLER == 0x00000002); /* Checks for struct lov_mds_md_v1 */ LASSERTF((int)sizeof(struct lov_mds_md_v1) == 32, " found %lld\n", @@ -1269,6 +1269,7 @@ void lustre_assert_wire_constants(void) CLASSERT(MDS_INODELOCK_LOOKUP == 0x000001); CLASSERT(MDS_INODELOCK_UPDATE == 0x000002); CLASSERT(MDS_INODELOCK_OPEN == 0x000004); + CLASSERT(MDS_DIR_END_OFF == 0xfffffffffffffffeULL); /* Checks for struct mds_rec_setattr */ LASSERTF((int)sizeof(struct mds_rec_setattr) == 96, " found %lld\n", @@ -2505,4 +2506,3 @@ void lustre_assert_wire_constants(void) (long long)(int)sizeof(((xattr_acl_header *)0)->a_entries)); #endif } - diff --git a/lustre/utils/wirecheck.c b/lustre/utils/wirecheck.c index 1dd1276..f67c26d 100644 --- a/lustre/utils/wirecheck.c +++ b/lustre/utils/wirecheck.c @@ -61,6 +61,9 @@ do { \ #define CHECK_CVALUE(a) \ printf(" CLASSERT("#a" == %lld);\n", (long long)a) +#define CHECK_CVALUE_X(a) \ + printf(" CLASSERT("#a" == 0x%.8x);\n", a) + #define CHECK_DEFINE(a) \ do { \ printf(" LASSERTF("#a" == "STRINGIFY(a) \ @@ -229,8 +232,8 @@ static void check_obd_connect_data(void) CHECK_CDEFINE(OBD_CONNECT_JOIN); CHECK_CDEFINE(OBD_CONNECT_ATTRFID); CHECK_CDEFINE(OBD_CONNECT_NODEVOH); - CHECK_CDEFINE(OBD_CONNECT_LCL_CLIENT); CHECK_CDEFINE(OBD_CONNECT_RMT_CLIENT); + CHECK_CDEFINE(OBD_CONNECT_RMT_CLIENT_FORCE); CHECK_CDEFINE(OBD_CONNECT_BRW_SIZE); CHECK_CDEFINE(OBD_CONNECT_QUOTA64); CHECK_CDEFINE(OBD_CONNECT_MDS_CAPA); @@ -246,6 +249,7 @@ static void check_obd_connect_data(void) CHECK_CDEFINE(OBD_CONNECT_VBR); CHECK_CDEFINE(OBD_CONNECT_LOV_V3); CHECK_CDEFINE(OBD_CONNECT_GRANT_SHRINK); + CHECK_CDEFINE(OBD_CONNECT_SKIP_ORPHAN); CHECK_CDEFINE(OBD_CONNECT_MAX_EASIZE); CHECK_CDEFINE(OBD_CONNECT_FULL20); CHECK_CDEFINE(OBD_CONNECT_LAYOUTLOCK); @@ -323,24 +327,24 @@ check_obdo(void) CHECK_CDEFINE(OBD_MD_FLXATTRRM); CHECK_CDEFINE(OBD_MD_FLACL); - CHECK_CDEFINE(OBD_FL_INLINEDATA); - CHECK_CDEFINE(OBD_FL_OBDMDEXISTS); - CHECK_CDEFINE(OBD_FL_DELORPHAN); - CHECK_CDEFINE(OBD_FL_NORPC); - CHECK_CDEFINE(OBD_FL_IDONLY); - CHECK_CDEFINE(OBD_FL_RECREATE_OBJS); - CHECK_CDEFINE(OBD_FL_DEBUG_CHECK); - CHECK_CDEFINE(OBD_FL_NO_USRQUOTA); - CHECK_CDEFINE(OBD_FL_NO_GRPQUOTA); - CHECK_CDEFINE(OBD_FL_CREATE_CROW); - CHECK_CDEFINE(OBD_FL_TRUNCLOCK); - CHECK_CDEFINE(OBD_FL_CKSUM_CRC32); - CHECK_CDEFINE(OBD_FL_CKSUM_ADLER); - CHECK_CDEFINE(OBD_FL_SHRINK_GRANT); - CHECK_CDEFINE(OBD_FL_MMAP); - CHECK_CDEFINE(OBD_FL_RECOV_RESEND); - CHECK_CVALUE(OBD_CKSUM_CRC32); - CHECK_CVALUE(OBD_CKSUM_ADLER); + CHECK_CVALUE_X(OBD_FL_INLINEDATA); + CHECK_CVALUE_X(OBD_FL_OBDMDEXISTS); + CHECK_CVALUE_X(OBD_FL_DELORPHAN); + CHECK_CVALUE_X(OBD_FL_NORPC); + CHECK_CVALUE_X(OBD_FL_IDONLY); + CHECK_CVALUE_X(OBD_FL_RECREATE_OBJS); + CHECK_CVALUE_X(OBD_FL_DEBUG_CHECK); + CHECK_CVALUE_X(OBD_FL_NO_USRQUOTA); + CHECK_CVALUE_X(OBD_FL_NO_GRPQUOTA); + CHECK_CVALUE_X(OBD_FL_CREATE_CROW); + CHECK_CVALUE_X(OBD_FL_TRUNCLOCK); + CHECK_CVALUE_X(OBD_FL_CKSUM_CRC32); + CHECK_CVALUE_X(OBD_FL_CKSUM_ADLER); + CHECK_CVALUE_X(OBD_FL_SHRINK_GRANT); + CHECK_CVALUE_X(OBD_FL_MMAP); + CHECK_CVALUE_X(OBD_FL_RECOV_RESEND); + CHECK_CVALUE_X(OBD_CKSUM_CRC32); + CHECK_CVALUE_X(OBD_CKSUM_ADLER); } static void @@ -585,6 +589,8 @@ check_mds_body(void) CHECK_CDEFINE(MDS_INODELOCK_LOOKUP); CHECK_CDEFINE(MDS_INODELOCK_UPDATE); CHECK_CDEFINE(MDS_INODELOCK_OPEN); + + CHECK_CDEFINE(MDS_DIR_END_OFF); } static void diff --git a/lustre/utils/wiretest.c b/lustre/utils/wiretest.c index 91f02fc..c670c69 100644 --- a/lustre/utils/wiretest.c +++ b/lustre/utils/wiretest.c @@ -63,8 +63,8 @@ void lustre_assert_wire_constants(void) { /* Wire protocol assertions generated by 'wirecheck' * (make -C lustre/utils newwiretest) - * running on Linux localhost.localdomain 2.6.18-prep #3 SMP Sun Nov 23 08:04:44 EST 2008 i68 - * with gcc version 4.1.1 20061011 (Red Hat 4.1.1-30) */ + * running on Linux nasf 2.6.18-238.9.1 #1 SMP Fri May 20 21:07:56 CST 2011 i686 i686 i386 GN + * with gcc version 4.1.1 20070105 (Red Hat 4.1.1-52) */ /* Constants... */ @@ -718,24 +718,24 @@ void lustre_assert_wire_constants(void) CLASSERT(OBD_MD_FLXATTRLS == (0x0000002000000000ULL)); CLASSERT(OBD_MD_FLXATTRRM == (0x0000004000000000ULL)); CLASSERT(OBD_MD_FLACL == (0x0000008000000000ULL)); - CLASSERT(OBD_FL_INLINEDATA == (0x00000001)); - CLASSERT(OBD_FL_OBDMDEXISTS == (0x00000002)); - CLASSERT(OBD_FL_DELORPHAN == (0x00000004)); - CLASSERT(OBD_FL_NORPC == (0x00000008)); - CLASSERT(OBD_FL_IDONLY == (0x00000010)); - CLASSERT(OBD_FL_RECREATE_OBJS == (0x00000020)); - CLASSERT(OBD_FL_DEBUG_CHECK == (0x00000040)); - CLASSERT(OBD_FL_NO_USRQUOTA == (0x00000100)); - CLASSERT(OBD_FL_NO_GRPQUOTA == (0x00000200)); - CLASSERT(OBD_FL_CREATE_CROW == (0x00000400)); - CLASSERT(OBD_FL_TRUNCLOCK == (0x00000800)); - CLASSERT(OBD_FL_CKSUM_CRC32 == (0x00001000)); - CLASSERT(OBD_FL_CKSUM_ADLER == (0x00002000)); - CLASSERT(OBD_FL_SHRINK_GRANT == (0x00020000)); - CLASSERT(OBD_FL_MMAP == (0x00040000)); - CLASSERT(OBD_FL_RECOV_RESEND == (0x00080000)); - CLASSERT(OBD_CKSUM_CRC32 == 1); - CLASSERT(OBD_CKSUM_ADLER == 2); + CLASSERT(OBD_FL_INLINEDATA == 0x00000001); + CLASSERT(OBD_FL_OBDMDEXISTS == 0x00000002); + CLASSERT(OBD_FL_DELORPHAN == 0x00000004); + CLASSERT(OBD_FL_NORPC == 0x00000008); + CLASSERT(OBD_FL_IDONLY == 0x00000010); + CLASSERT(OBD_FL_RECREATE_OBJS == 0x00000020); + CLASSERT(OBD_FL_DEBUG_CHECK == 0x00000040); + CLASSERT(OBD_FL_NO_USRQUOTA == 0x00000100); + CLASSERT(OBD_FL_NO_GRPQUOTA == 0x00000200); + CLASSERT(OBD_FL_CREATE_CROW == 0x00000400); + CLASSERT(OBD_FL_TRUNCLOCK == 0x00000800); + CLASSERT(OBD_FL_CKSUM_CRC32 == 0x00001000); + CLASSERT(OBD_FL_CKSUM_ADLER == 0x00002000); + CLASSERT(OBD_FL_SHRINK_GRANT == 0x00020000); + CLASSERT(OBD_FL_MMAP == 0x00040000); + CLASSERT(OBD_FL_RECOV_RESEND == 0x00080000); + CLASSERT(OBD_CKSUM_CRC32 == 0x00000001); + CLASSERT(OBD_CKSUM_ADLER == 0x00000002); /* Checks for struct lov_mds_md_v1 */ LASSERTF((int)sizeof(struct lov_mds_md_v1) == 32, " found %lld\n", @@ -1267,6 +1267,7 @@ void lustre_assert_wire_constants(void) CLASSERT(MDS_INODELOCK_LOOKUP == 0x000001); CLASSERT(MDS_INODELOCK_UPDATE == 0x000002); CLASSERT(MDS_INODELOCK_OPEN == 0x000004); + CLASSERT(MDS_DIR_END_OFF == 0xfffffffffffffffeULL); /* Checks for struct mds_rec_setattr */ LASSERTF((int)sizeof(struct mds_rec_setattr) == 96, " found %lld\n", @@ -2503,4 +2504,3 @@ void lustre_assert_wire_constants(void) (long long)(int)sizeof(((xattr_acl_header *)0)->a_entries)); #endif } -