From 20d7508afa3b6f3ac703b4d43e5b1ad0ba782f19 Mon Sep 17 00:00:00 2001 From: Fan Yong Date: Tue, 20 Oct 2015 06:33:05 +0800 Subject: [PATCH 1/1] LU-7543 obd: reserve connection flag OBD_CONNECT_LOCK_AHEAD The connection flag OBD_CONNECT_LOCK_AHEAD will be used for the following the patch: LU-6917 LDLM lock ahead http://review.whamcloud.com/13564 Land the connection flags to master earlier for reserving the slot to avoid potential conflict with others. Signed-off-by: Fan Yong Change-Id: Ifd5d26d52336b45c962cb34a83bc3582646cfdf4 Reviewed-on: http://review.whamcloud.com/17646 Tested-by: Jenkins Reviewed-by: Andreas Dilger Reviewed-by: Patrick Farrell Tested-by: Maloo --- lustre/include/lustre/lustre_idl.h | 1 + lustre/obdclass/lprocfs_status.c | 2 +- lustre/ptlrpc/wiretest.c | 2 ++ lustre/utils/wirecheck.c | 1 + lustre/utils/wiretest.c | 2 ++ 5 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lustre/include/lustre/lustre_idl.h b/lustre/include/lustre/lustre_idl.h index 1360c96..c08719b 100644 --- a/lustre/include/lustre/lustre_idl.h +++ b/lustre/include/lustre/lustre_idl.h @@ -1265,6 +1265,7 @@ extern void lustre_swab_ptlrpc_body(struct ptlrpc_body *pb); #define OBD_CONNECT_LOCK_AHEAD 0x1000000000000000ULL /* lock ahead */ /** bulk matchbits is sent within ptlrpc_body */ #define OBD_CONNECT_BULK_MBITS 0x2000000000000000ULL +#define OBD_CONNECT_OBDOPACK 0x4000000000000000ULL /* compact OUT obdo */ /* XXX README XXX: * 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 diff --git a/lustre/obdclass/lprocfs_status.c b/lustre/obdclass/lprocfs_status.c index b9b43a2..956abe2 100644 --- a/lustre/obdclass/lprocfs_status.c +++ b/lustre/obdclass/lprocfs_status.c @@ -655,7 +655,7 @@ static const char *obd_connect_names[] = { "fileset_mount", "lock_ahead", "bulk_mbits", - "unknown", + "compact_obdo", NULL }; diff --git a/lustre/ptlrpc/wiretest.c b/lustre/ptlrpc/wiretest.c index 3280159..f64bcf7 100644 --- a/lustre/ptlrpc/wiretest.c +++ b/lustre/ptlrpc/wiretest.c @@ -1192,6 +1192,8 @@ void lustre_assert_wire_constants(void) OBD_CONNECT_LOCK_AHEAD); LASSERTF(OBD_CONNECT_BULK_MBITS == 0x2000000000000000ULL, "found 0x%.16llxULL\n", OBD_CONNECT_BULK_MBITS); + LASSERTF(OBD_CONNECT_OBDOPACK == 0x4000000000000000ULL, "found 0x%.16llxULL\n", + OBD_CONNECT_OBDOPACK); 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 9d2664a..eaec094 100644 --- a/lustre/utils/wirecheck.c +++ b/lustre/utils/wirecheck.c @@ -530,6 +530,7 @@ check_obd_connect_data(void) CHECK_DEFINE_64X(OBD_CONNECT_SUBTREE); CHECK_DEFINE_64X(OBD_CONNECT_LOCK_AHEAD); CHECK_DEFINE_64X(OBD_CONNECT_BULK_MBITS); + CHECK_DEFINE_64X(OBD_CONNECT_OBDOPACK); 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 ec35568..00771ee 100644 --- a/lustre/utils/wiretest.c +++ b/lustre/utils/wiretest.c @@ -1203,6 +1203,8 @@ void lustre_assert_wire_constants(void) OBD_CONNECT_LOCK_AHEAD); LASSERTF(OBD_CONNECT_BULK_MBITS == 0x2000000000000000ULL, "found 0x%.16llxULL\n", OBD_CONNECT_BULK_MBITS); + LASSERTF(OBD_CONNECT_OBDOPACK == 0x4000000000000000ULL, "found 0x%.16llxULL\n", + OBD_CONNECT_OBDOPACK); LASSERTF(OBD_CKSUM_CRC32 == 0x00000001UL, "found 0x%.8xUL\n", (unsigned)OBD_CKSUM_CRC32); LASSERTF(OBD_CKSUM_ADLER == 0x00000002UL, "found 0x%.8xUL\n", -- 1.8.3.1