From c801f497807f45e7e081f0e1ea11037749a60270 Mon Sep 17 00:00:00 2001 From: Fan Yong Date: Tue, 20 Oct 2015 06:12:48 +0800 Subject: [PATCH] LU-7543 obd: reserve connection flag OBD_CONNECT_OBDOPACK The connection flag OBD_CONNECT_OBDOPACK will be used for the following the patch: LU-4215 optimize OUT protocol http://review.whamcloud.com/15336 Land the connection flags to master earlier for reserving the slot to avoid potential conflict with others. Signed-off-by: Fan Yong Change-Id: I75171f5e9095d40481b4462de74c6a63e1cf3084 Reviewed-on: http://review.whamcloud.com/17645 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 | 1 + lustre/ptlrpc/wiretest.c | 2 ++ lustre/utils/wirecheck.c | 1 + lustre/utils/wiretest.c | 2 ++ 5 files changed, 7 insertions(+) diff --git a/lustre/include/lustre/lustre_idl.h b/lustre/include/lustre/lustre_idl.h index 538bf76..1360c96 100644 --- a/lustre/include/lustre/lustre_idl.h +++ b/lustre/include/lustre/lustre_idl.h @@ -1262,6 +1262,7 @@ extern void lustre_swab_ptlrpc_body(struct ptlrpc_body *pb); RPCs in parallel */ #define OBD_CONNECT_DIR_STRIPE 0x400000000000000ULL /* striped DNE dir */ #define OBD_CONNECT_SUBTREE 0x800000000000000ULL /* fileset mount */ +#define OBD_CONNECT_LOCK_AHEAD 0x1000000000000000ULL /* lock ahead */ /** bulk matchbits is sent within ptlrpc_body */ #define OBD_CONNECT_BULK_MBITS 0x2000000000000000ULL /* XXX README XXX: diff --git a/lustre/obdclass/lprocfs_status.c b/lustre/obdclass/lprocfs_status.c index a9e4477..b9b43a2 100644 --- a/lustre/obdclass/lprocfs_status.c +++ b/lustre/obdclass/lprocfs_status.c @@ -653,6 +653,7 @@ static const char *obd_connect_names[] = { "multi_mod_rpcs", "dir_stripe", "fileset_mount", + "lock_ahead", "bulk_mbits", "unknown", NULL diff --git a/lustre/ptlrpc/wiretest.c b/lustre/ptlrpc/wiretest.c index 0aab8a4..3280159 100644 --- a/lustre/ptlrpc/wiretest.c +++ b/lustre/ptlrpc/wiretest.c @@ -1188,6 +1188,8 @@ void lustre_assert_wire_constants(void) OBD_CONNECT_DIR_STRIPE); LASSERTF(OBD_CONNECT_SUBTREE == 0x800000000000000ULL, "found 0x%.16llxULL\n", OBD_CONNECT_SUBTREE); + LASSERTF(OBD_CONNECT_LOCK_AHEAD == 0x1000000000000000ULL, "found 0x%.16llxULL\n", + OBD_CONNECT_LOCK_AHEAD); LASSERTF(OBD_CONNECT_BULK_MBITS == 0x2000000000000000ULL, "found 0x%.16llxULL\n", OBD_CONNECT_BULK_MBITS); LASSERTF(OBD_CKSUM_CRC32 == 0x00000001UL, "found 0x%.8xUL\n", diff --git a/lustre/utils/wirecheck.c b/lustre/utils/wirecheck.c index 2ffccf1..9d2664a 100644 --- a/lustre/utils/wirecheck.c +++ b/lustre/utils/wirecheck.c @@ -528,6 +528,7 @@ check_obd_connect_data(void) CHECK_DEFINE_64X(OBD_CONNECT_MULTIMODRPCS); CHECK_DEFINE_64X(OBD_CONNECT_DIR_STRIPE); CHECK_DEFINE_64X(OBD_CONNECT_SUBTREE); + CHECK_DEFINE_64X(OBD_CONNECT_LOCK_AHEAD); CHECK_DEFINE_64X(OBD_CONNECT_BULK_MBITS); CHECK_VALUE_X(OBD_CKSUM_CRC32); diff --git a/lustre/utils/wiretest.c b/lustre/utils/wiretest.c index 6371bca..ec35568 100644 --- a/lustre/utils/wiretest.c +++ b/lustre/utils/wiretest.c @@ -1199,6 +1199,8 @@ void lustre_assert_wire_constants(void) OBD_CONNECT_DIR_STRIPE); LASSERTF(OBD_CONNECT_SUBTREE == 0x800000000000000ULL, "found 0x%.16llxULL\n", OBD_CONNECT_SUBTREE); + LASSERTF(OBD_CONNECT_LOCK_AHEAD == 0x1000000000000000ULL, "found 0x%.16llxULL\n", + OBD_CONNECT_LOCK_AHEAD); LASSERTF(OBD_CONNECT_BULK_MBITS == 0x2000000000000000ULL, "found 0x%.16llxULL\n", OBD_CONNECT_BULK_MBITS); LASSERTF(OBD_CKSUM_CRC32 == 0x00000001UL, "found 0x%.8xUL\n", -- 1.8.3.1