openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Fan Yong 2016-11-23 18:01:19 -05:00 committed by Greg Kroah-Hartman
parent 0b83bc1675
commit 59b6693aea
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/staging/lustre/lustre/include/lustre/lustre_idl.h
View File

@ -1193,6 +1193,7 @@ void lustre_swab_ptlrpc_body(struct ptlrpc_body *pb);
#define OBD_CONNECT_LOCK_AHEAD 0x1000000000000000ULL /* lock ahead */ #define OBD_CONNECT_LOCK_AHEAD 0x1000000000000000ULL /* lock ahead */
/** bulk matchbits is sent within ptlrpc_body */ /** bulk matchbits is sent within ptlrpc_body */
#define OBD_CONNECT_BULK_MBITS 0x2000000000000000ULL #define OBD_CONNECT_BULK_MBITS 0x2000000000000000ULL
#define OBD_CONNECT_OBDOPACK 0x4000000000000000ULL /* compact OUT obdo */
/* XXX README XXX: /* XXX README XXX:
* Please DO NOT add flag values here before first ensuring that this same * Please DO NOT add flag values here before first ensuring that this same

2
drivers/staging/lustre/lustre/obdclass/lprocfs_status.c
View File

@ -105,7 +105,7 @@ static const char * const obd_connect_names[] = {
"subtree", "subtree",
"lock_ahead", "lock_ahead",
"bulk_mbits", "bulk_mbits",
"unknown", "compact_obdo",
NULL NULL
}; };

2
drivers/staging/lustre/lustre/ptlrpc/wiretest.c
View File

@ -1109,6 +1109,8 @@ void lustre_assert_wire_constants(void)
OBD_CONNECT_SUBTREE); OBD_CONNECT_SUBTREE);
LASSERTF(OBD_CONNECT_LOCK_AHEAD == 0x1000000000000000ULL, "found 0x%.16llxULL\n", LASSERTF(OBD_CONNECT_LOCK_AHEAD == 0x1000000000000000ULL, "found 0x%.16llxULL\n",
OBD_CONNECT_LOCK_AHEAD); 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", LASSERTF(OBD_CKSUM_CRC32 == 0x00000001UL, "found 0x%.8xUL\n",
(unsigned)OBD_CKSUM_CRC32); (unsigned)OBD_CKSUM_CRC32);
LASSERTF(OBD_CKSUM_ADLER == 0x00000002UL, "found 0x%.8xUL\n", LASSERTF(OBD_CKSUM_ADLER == 0x00000002UL, "found 0x%.8xUL\n",