Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9ed8e66a authored by Fan Yong's avatar Fan Yong Committed by Greg Kroah-Hartman
Browse files

staging: lustre: obd: reserve connection flag OBD_CONNECT_SUBTREE 

The connection flag OBD_CONNECT_SUBTREE will be used for the
following the patch: LU-28 mounting of filesystem from MDS
http://review.whamcloud.com/5007



Land the connection flags to master 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/17644


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 986dbb58

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

+1 −0
Original line number Diff line number Diff line
@@ -1189,6 +1189,7 @@ 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 */

/** 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
@@ -102,6 +102,7 @@ static const char * const obd_connect_names[] = { 
	"unlink_close",

	"multi_mod_rpcs",

	"dir_stripe",

	"subtree",

	"bulk_mbits",

	"unknown",

	NULL

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

+2 −0
Original line number Diff line number Diff line
@@ -1105,6 +1105,8 @@ void lustre_assert_wire_constants(void) 
		 OBD_CONNECT_MULTIMODRPCS);

	LASSERTF(OBD_CONNECT_DIR_STRIPE == 0x400000000000000ULL, "found 0x%.16llxULL\n",

		 OBD_CONNECT_DIR_STRIPE);

	LASSERTF(OBD_CONNECT_SUBTREE == 0x800000000000000ULL, "found 0x%.16llxULL\n",

		 OBD_CONNECT_SUBTREE);

	LASSERTF(OBD_CKSUM_CRC32 == 0x00000001UL, "found 0x%.8xUL\n",

		 (unsigned)OBD_CKSUM_CRC32);

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