From: Li Wei Date: Tue, 5 Feb 2013 06:54:21 +0000 (+0800) Subject: LU-2467 utils: Update wirecheck for new connect flags X-Git-Tag: 2.3.62~17 X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=afe1d3a47bc97525d0f5adf686bb24e848e04755;p=fs%2Flustre-release.git LU-2467 utils: Update wirecheck for new connect flags This patch adds OBD_CONNECT_PINGLESS to wirecheck and updates wiretests accordingly. Also, the connect flag readme comment is updated to include this as a guidance for adding connect flags in the future. Signed-off-by: Li Wei Change-Id: I131291dd2dcfda07045a09cbfde4833128464966 Reviewed-on: http://review.whamcloud.com/5269 Reviewed-by: Niu Yawei Tested-by: Hudson Tested-by: Maloo Reviewed-by: Andreas Dilger --- diff --git a/lustre/include/lustre/lustre_idl.h b/lustre/include/lustre/lustre_idl.h index a19a8d9..2cde448 100644 --- a/lustre/include/lustre/lustre_idl.h +++ b/lustre/include/lustre/lustre_idl.h @@ -1244,8 +1244,9 @@ extern void lustre_swab_ptlrpc_body(struct ptlrpc_body *pb); * Please DO NOT add flag values here before first ensuring that this same * flag value is not in use on some other branch. Please clear any such * changes with senior engineers before starting to use a new flag. Then, - * submit a small patch against EVERY branch that ONLY adds the new flag - * and updates obd_connect_names[] for lprocfs_rd_connect_flags(), so it + * submit a small patch against EVERY branch that ONLY adds the new flag, + * updates obd_connect_names[] for lprocfs_rd_connect_flags(), adds the + * flag to check_obd_connect_data(), and updates wiretests accordingly, so it * can be approved and landed easily to reserve the flag for future use. */ /* The MNE_SWAB flag is overloading the MDS_MDS bit only for the MGS diff --git a/lustre/ptlrpc/wiretest.c b/lustre/ptlrpc/wiretest.c index 0a9f6e1..8d8fd5c 100644 --- a/lustre/ptlrpc/wiretest.c +++ b/lustre/ptlrpc/wiretest.c @@ -1158,6 +1158,8 @@ void lustre_assert_wire_constants(void) OBD_CONNECT_LIGHTWEIGHT); LASSERTF(OBD_CONNECT_SHORTIO == 0x2000000000000ULL, "found 0x%.16llxULL\n", OBD_CONNECT_SHORTIO); + LASSERTF(OBD_CONNECT_PINGLESS == 0x4000000000000ULL, "found 0x%.16llxULL\n", + OBD_CONNECT_PINGLESS); LASSERTF(OBD_CKSUM_CRC32 == 0x00000001UL, "found 0x%.8xUL\n", (unsigned)OBD_CKSUM_CRC32); LASSERTF(OBD_CKSUM_ADLER == 0x00000002UL, "found 0x%.8xUL\n", diff --git a/lustre/utils/wirecheck.c b/lustre/utils/wirecheck.c index 66d3cf3..0bac42c 100644 --- a/lustre/utils/wirecheck.c +++ b/lustre/utils/wirecheck.c @@ -520,6 +520,7 @@ check_obd_connect_data(void) CHECK_DEFINE_64X(OBD_CONNECT_NANOSEC_TIME); CHECK_DEFINE_64X(OBD_CONNECT_LIGHTWEIGHT); CHECK_DEFINE_64X(OBD_CONNECT_SHORTIO); + CHECK_DEFINE_64X(OBD_CONNECT_PINGLESS); CHECK_VALUE_X(OBD_CKSUM_CRC32); CHECK_VALUE_X(OBD_CKSUM_ADLER); diff --git a/lustre/utils/wiretest.c b/lustre/utils/wiretest.c index 561b7a7..797790222 100644 --- a/lustre/utils/wiretest.c +++ b/lustre/utils/wiretest.c @@ -1166,6 +1166,8 @@ void lustre_assert_wire_constants(void) OBD_CONNECT_LIGHTWEIGHT); LASSERTF(OBD_CONNECT_SHORTIO == 0x2000000000000ULL, "found 0x%.16llxULL\n", OBD_CONNECT_SHORTIO); + LASSERTF(OBD_CONNECT_PINGLESS == 0x4000000000000ULL, "found 0x%.16llxULL\n", + OBD_CONNECT_PINGLESS); LASSERTF(OBD_CKSUM_CRC32 == 0x00000001UL, "found 0x%.8xUL\n", (unsigned)OBD_CKSUM_CRC32); LASSERTF(OBD_CKSUM_ADLER == 0x00000002UL, "found 0x%.8xUL\n",