From cb0aa0285b32fb432fc484cfd44e6e6e789c1025 Mon Sep 17 00:00:00 2001 From: Andreas Dilger Date: Thu, 5 Jan 2023 15:44:50 -0700 Subject: [PATCH] LU-2771 ldlm: remove obsolete LDLM_FL_SERVER_LOCK The LDLM_FL_SERVER_LOCK flag and accompanying accessor macros have never been used since they were first introduced. Remove them. It looks like this may have been duplicated by LDLM_FL_NS_SRV. Test-Parameters: trivial Fixes: caa55aec4a ("LU-2771 dlmlock: compress out unused space") Signed-off-by: Andreas Dilger Change-Id: Iffc9b126334a327a9054f9acae86f4a0d03ebbe5 Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/49563 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Vitaliy Kuznetsov Reviewed-by: jsimmons Reviewed-by: Oleg Drokin --- contrib/debug_tools/epython_scripts/ldlm_lockflags.py | 1 - lustre/include/lustre_dlm_flags.h | 6 ------ 2 files changed, 7 deletions(-) diff --git a/contrib/debug_tools/epython_scripts/ldlm_lockflags.py b/contrib/debug_tools/epython_scripts/ldlm_lockflags.py index 5788e3ee..c1ef74b 100644 --- a/contrib/debug_tools/epython_scripts/ldlm_lockflags.py +++ b/contrib/debug_tools/epython_scripts/ldlm_lockflags.py @@ -52,7 +52,6 @@ ldlm_flags_tbl = { 0x0001000000000000: "NO_LRU", # bit 48 0x0002000000000000: "FAIL_NOTIFIED", # bit 49 0x0004000000000000: "DESTROYED", # bit 50 - 0x0008000000000000: "SERVER_LOCK", # bit 51 0x0010000000000000: "RES_LOCKED", # bit 52 0x0020000000000000: "WAITED", # bit 53 0x0040000000000000: "NS_SRV", # bit 54 diff --git a/lustre/include/lustre_dlm_flags.h b/lustre/include/lustre_dlm_flags.h index 1fa049d..1af4284 100644 --- a/lustre/include/lustre_dlm_flags.h +++ b/lustre/include/lustre_dlm_flags.h @@ -331,12 +331,6 @@ #define ldlm_set_destroyed(_l) LDLM_SET_FLAG(( _l), 1ULL << 50) #define ldlm_clear_destroyed(_l) LDLM_CLEAR_FLAG((_l), 1ULL << 50) -/** flag whether this is a server namespace lock */ -#define LDLM_FL_SERVER_LOCK 0x0008000000000000ULL // bit 51 -#define ldlm_is_server_lock(_l) LDLM_TEST_FLAG(( _l), 1ULL << 51) -#define ldlm_set_server_lock(_l) LDLM_SET_FLAG(( _l), 1ULL << 51) -#define ldlm_clear_server_lock(_l) LDLM_CLEAR_FLAG((_l), 1ULL << 51) - /** * It's set in lock_res_and_lock() and unset in unlock_res_and_lock(). * -- 1.8.3.1