diff options
| author |   Fan Yong <fan.yong@intel.com> | 2016-11-23 18:01:19 -0500 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-11-29 21:50:38 +0100 |
| commit | 59b6693aea77c5b53412853222d3066d5dc55f5f (patch) | |
| tree | df91de0589222caa3ed6f6c933cf6fd4ec37bd64 | |
| parent | staging: lustre: obd: reserve connection flag OBD_CONNECT_LOCK_AHEAD (diff) | |
| download | wireguard-linux-59b6693aea77c5b53412853222d3066d5dc55f5f.tar.xz wireguard-linux-59b6693aea77c5b53412853222d3066d5dc55f5f.zip | |
staging: lustre: 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 upstream client earlier for reserving
the slot to avoid potential conflict with others.
Signed-off-by: Fan Yong <fan.yong@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-7543
Reviewed-on: http://review.whamcloud.com/17646
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Patrick Farrell <paf@cray.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/lustre/lustre/include/lustre/lustre_idl.h | 1 | ||||
| -rw-r--r-- | drivers/staging/lustre/lustre/obdclass/lprocfs_status.c | 2 | ||||
| -rw-r--r-- | drivers/staging/lustre/lustre/ptlrpc/wiretest.c | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h b/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h index 6c1eb6bbef79..3a633ebf22bb 100644 --- a/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h +++ b/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h @@ -1193,6 +1193,7 @@ 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 diff --git a/drivers/staging/lustre/lustre/obdclass/lprocfs_status.c b/drivers/staging/lustre/lustre/obdclass/lprocfs_status.c index 5e341e31877a..85b505edf340 100644 --- a/drivers/staging/lustre/lustre/obdclass/lprocfs_status.c +++ b/drivers/staging/lustre/lustre/obdclass/lprocfs_status.c @@ -105,7 +105,7 @@ static const char * const obd_connect_names[] = { "subtree", "lock_ahead", "bulk_mbits", - "unknown", + "compact_obdo", NULL }; diff --git a/drivers/staging/lustre/lustre/ptlrpc/wiretest.c b/drivers/staging/lustre/lustre/ptlrpc/wiretest.c index afa79d5e7a89..04e94710f9d1 100644 --- a/drivers/staging/lustre/lustre/ptlrpc/wiretest.c +++ b/drivers/staging/lustre/lustre/ptlrpc/wiretest.c @@ -1109,6 +1109,8 @@ void lustre_assert_wire_constants(void) OBD_CONNECT_SUBTREE); LASSERTF(OBD_CONNECT_LOCK_AHEAD == 0x1000000000000000ULL, "found 0x%.16llxULL\n", OBD_CONNECT_LOCK_AHEAD); + 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", |