From bf959135d50c2e7e3d4414a6792f63665c6da22c Mon Sep 17 00:00:00 2001 From: "Alexander.Boyko" Date: Wed, 10 Oct 2012 12:23:08 +0400 Subject: [PATCH] LU-1757 brw: added OBD short io connect flag To prevent collisions with any future flags needed in features written against this branch. Signed-off-by: Alexander Boyko Change-Id: I567020c24ab64c4faeed159ef8c6814e74f73503 Reviewed-on: http://review.whamcloud.com/3891 Tested-by: Hudson Tested-by: Maloo Reviewed-by: Johann Lombardi Reviewed-by: Andreas Dilger Reviewed-by: Oleg Drokin --- 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 4979b69..508b52e 100644 --- a/lustre/include/lustre/lustre_idl.h +++ b/lustre/include/lustre/lustre_idl.h @@ -1168,6 +1168,7 @@ extern void lustre_swab_ptlrpc_body(struct ptlrpc_body *pb); #define OBD_CONNECT_NANOSEC_TIME 0x200000000000ULL /* nanosecond timestamps */ #define OBD_CONNECT_LVB_TYPE 0x400000000000ULL /* variable type of LVB */ #define OBD_CONNECT_LIGHTWEIGHT 0x1000000000000ULL/* lightweight connection */ +#define OBD_CONNECT_SHORTIO 0x2000000000000ULL/* short io */ /* 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 624140c..dc595f5 100644 --- a/lustre/obdclass/lprocfs_status.c +++ b/lustre/obdclass/lprocfs_status.c @@ -1014,6 +1014,7 @@ static const char *obd_connect_names[] = { "lvb_type", "unknown", "lightweight_conn", + "short_io", NULL }; diff --git a/lustre/ptlrpc/wiretest.c b/lustre/ptlrpc/wiretest.c index 65b2596..fd929b8 100644 --- a/lustre/ptlrpc/wiretest.c +++ b/lustre/ptlrpc/wiretest.c @@ -1071,6 +1071,8 @@ void lustre_assert_wire_constants(void) OBD_CONNECT_GRANT_PARAM); LASSERTF(OBD_CONNECT_LIGHTWEIGHT == 0x1000000000000ULL, "found 0x%.16llxULL\n", OBD_CONNECT_LIGHTWEIGHT); + LASSERTF(OBD_CONNECT_SHORTIO == 0x2000000000000ULL, "found 0x%.16llxULL\n", + OBD_CONNECT_SHORTIO); 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 900509a..d912f75 100644 --- a/lustre/utils/wirecheck.c +++ b/lustre/utils/wirecheck.c @@ -497,6 +497,7 @@ check_obd_connect_data(void) CHECK_DEFINE_64X(OBD_CONNECT_EINPROGRESS); CHECK_DEFINE_64X(OBD_CONNECT_GRANT_PARAM); CHECK_DEFINE_64X(OBD_CONNECT_LIGHTWEIGHT); + CHECK_DEFINE_64X(OBD_CONNECT_SHORTIO); 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 5fbdb13..bca0115 100644 --- a/lustre/utils/wiretest.c +++ b/lustre/utils/wiretest.c @@ -1079,6 +1079,8 @@ void lustre_assert_wire_constants(void) OBD_CONNECT_GRANT_PARAM); LASSERTF(OBD_CONNECT_LIGHTWEIGHT == 0x1000000000000ULL, "found 0x%.16llxULL\n", OBD_CONNECT_LIGHTWEIGHT); + LASSERTF(OBD_CONNECT_SHORTIO == 0x2000000000000ULL, "found 0x%.16llxULL\n", + OBD_CONNECT_SHORTIO); 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