From 42fa8665c21c01a07c40aa0886b4c6bf6193327f Mon Sep 17 00:00:00 2001 From: "Iurii.Golovach" Date: Tue, 16 Oct 2012 16:39:07 +0300 Subject: [PATCH] LU-1770 ptlrpc: introducing OBD_CONNECT_FLOCK_OWNER flag After applying flock policy fix into the 1.8 users met with an issue when 1.8 clients with a fixed flock policy recognized incorrectly by 2.x servers. This flag is intended to present 1.8 clients with fixed flock policy to let 2.x servers make flock policy recognition correctly. Patches with functionality changes were attached on review at LU-1575 Xyratex-bug-id: MRP-489 Reviewed-by: Alexey Lyashkov Reviewed-by: Andriy Skulysh Signed-off-by: Iurii Golovach Change-Id: I0b203a7e181310c2888ae5bbe8c90ca0a5bbe549 Reviewed-on: http://review.whamcloud.com/3723 Reviewed-by: Cory Spitz Tested-by: Hudson Tested-by: Maloo Reviewed-by: Johann Lombardi --- lustre/include/lustre/lustre_idl.h | 4 +++- lustre/obdclass/lprocfs_status.c | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lustre/include/lustre/lustre_idl.h b/lustre/include/lustre/lustre_idl.h index 66371fe..f0e794e 100644 --- a/lustre/include/lustre/lustre_idl.h +++ b/lustre/include/lustre/lustre_idl.h @@ -371,8 +371,10 @@ extern void lustre_swab_ptlrpc_body(struct ptlrpc_body *pb, int msgsize); * write RPC error properly */ #define OBD_CONNECT_GRANT_PARAM 0x100000000000ULL/* extra grant params used for * finer space reservation */ -#define OBD_CONNECT_NANOSEC_TIME 0x200000000000ULL /* nanosecond timestamps */ +#define OBD_CONNECT_FLOCK_OWNER 0x200000000000ULL /* for the fixed 1.8 + * policy and 2.x server */ #define OBD_CONNECT_LVB_TYPE 0x400000000000ULL /* variable type of LVB */ +#define OBD_CONNECT_NANOSEC_TIME 0x800000000000ULL /* nanosecond timestamps */ #define OBD_CONNECT_LIGHTWEIGHT 0x1000000000000ULL /* lightweight connection */ /* XXX README XXX: * Please DO NOT add flag values here before first ensuring that this same diff --git a/lustre/obdclass/lprocfs_status.c b/lustre/obdclass/lprocfs_status.c index 2b0c5b4..b641790 100644 --- a/lustre/obdclass/lprocfs_status.c +++ b/lustre/obdclass/lprocfs_status.c @@ -759,10 +759,11 @@ static const char *obd_connect_names[] = { "umask", "einprogress", "grant_param", - "nanoseconds_times", + "flock_owner", "lvb_type", - "unknown", + "nanoseconds_times", "lightweight_conn", + "unknown", NULL }; -- 1.8.3.1