Commit 0b83bc16 authored by Fan Yong's avatar Fan Yong Committed by Greg Kroah-Hartman
Browse files

staging: lustre: 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 upstream client earlier for reserving
the slot to avoid potential conflict with others.

Signed-off-by: default avatarFan Yong <fan.yong@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-7543
Reviewed-on: http://review.whamcloud.com/17645


Reviewed-by: default avatarAndreas Dilger <andreas.dilger@intel.com>
Reviewed-by: default avatarPatrick Farrell <paf@cray.com>
Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9ed8e66a

drivers/staging/lustre/lustre/include/lustre/lustre_idl.h

+1 −0
Original line number Diff line number Diff line
@@ -1190,6 +1190,7 @@ void lustre_swab_ptlrpc_body(struct ptlrpc_body *pb); 
						       */

#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

drivers/staging/lustre/lustre/obdclass/lprocfs_status.c

+1 −0
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ static const char * const obd_connect_names[] = { 
	"multi_mod_rpcs",

	"dir_stripe",

	"subtree",

	"lock_ahead",

	"bulk_mbits",

	"unknown",

	NULL

drivers/staging/lustre/lustre/ptlrpc/wiretest.c

+2 −0
Original line number Diff line number Diff line
@@ -1107,6 +1107,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_CKSUM_CRC32 == 0x00000001UL, "found 0x%.8xUL\n",

		 (unsigned)OBD_CKSUM_CRC32);

	LASSERTF(OBD_CKSUM_ADLER == 0x00000002UL, "found 0x%.8xUL\n",

CRA Git | Maintained and supported by SUSTech CRA and CCSE