From eb548e596b6ae1137388b19430e1eced4f7bddc1 Mon Sep 17 00:00:00 2001 From: Andriy Skulysh Date: Fri, 18 Aug 2023 14:23:25 +0300 Subject: [PATCH] LU-17589 flock: Flock blocking information becomes stale Blocking information remains to point for already cancelled lock. Find new blocker on each reprocess. Change-Id: I8d353795170f4fd0ae55dd646035cf8feb4cc162 HPE-bug-id: LUS-11784, LUS-11999 Signed-off-by: Andriy Skulysh Reviewed-by: Vitaly Fertman Reviewed-by: Alexander Zarochentsev Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/54219 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Yang Sheng Reviewed-by: Oleg Drokin --- lustre/ldlm/ldlm_flock.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lustre/ldlm/ldlm_flock.c b/lustre/ldlm/ldlm_flock.c index 05c47f9..4a1df40 100644 --- a/lustre/ldlm/ldlm_flock.c +++ b/lustre/ldlm/ldlm_flock.c @@ -434,6 +434,8 @@ reprocess: continue; if (intention != LDLM_PROCESS_ENQUEUE) { + ldlm_flock_blocking_unlink(req); + ldlm_flock_blocking_link(req, lock); if (ldlm_flock_deadlock(req, lock)) { ldlm_flock_cancel_on_deadlock( req, grant_work); -- 1.8.3.1