diff options
| author | Fan Yong <fan.yong@intel.com> | 2016-11-23 18:01:17 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-11-29 21:50:38 +0100 |
| commit | 9ed8e66a431049710afb39ff3b163a3b517baaed (patch) | |
| tree | 44556ad0f2e7612ad93f3fa59912ac45b7191b3b /drivers/staging | |
| parent | 986dbb586fdacbc1e530131b8f075fc7c7d4c506 (diff) | |
| download | linux-stable-9ed8e66a431049710afb39ff3b163a3b517baaed.tar.gz linux-stable-9ed8e66a431049710afb39ff3b163a3b517baaed.tar.bz2 linux-stable-9ed8e66a431049710afb39ff3b163a3b517baaed.zip | |
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: Fan 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: 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>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/lustre/lustre/include/lustre/lustre_idl.h | 1 | ||||
| -rw-r--r-- | drivers/staging/lustre/lustre/obdclass/lprocfs_status.c | 1 | ||||
| -rw-r--r-- | drivers/staging/lustre/lustre/ptlrpc/wiretest.c | 2 |
3 files changed, 4 insertions, 0 deletions
diff --git a/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h b/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h index 6a4a7d811202..89956898d0c7 100644 --- a/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h +++ b/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h @@ -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 diff --git a/drivers/staging/lustre/lustre/obdclass/lprocfs_status.c b/drivers/staging/lustre/lustre/obdclass/lprocfs_status.c index db4999246fea..f78928f3a51f 100644 --- a/drivers/staging/lustre/lustre/obdclass/lprocfs_status.c +++ b/drivers/staging/lustre/lustre/obdclass/lprocfs_status.c @@ -102,6 +102,7 @@ static const char * const obd_connect_names[] = { "unlink_close", "multi_mod_rpcs", "dir_stripe", + "subtree", "bulk_mbits", "unknown", NULL diff --git a/drivers/staging/lustre/lustre/ptlrpc/wiretest.c b/drivers/staging/lustre/lustre/ptlrpc/wiretest.c index b2395638cccb..5619f11570b7 100644 --- a/drivers/staging/lustre/lustre/ptlrpc/wiretest.c +++ b/drivers/staging/lustre/lustre/ptlrpc/wiretest.c @@ -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", |