From 5c0961095c69cc3a6f292a6e6cfa628b74c4e914 Mon Sep 17 00:00:00 2001 From: Andriy Skulysh Date: Wed, 19 Feb 2020 22:06:33 +0200 Subject: [PATCH] LU-13991 ldlm: speedup flock reprocess We can check for deadlock only for first conflicting lock, the rest deadlock checks will be performed after cancelation of first conflicting lock. Lustre-change: https://review.whamcloud.com/40048 Lustre-commit: dadec10251090ba88c1b39517943e6603ba6d682 Change-Id: I18359db405ab021a4f32ac833de203254097142d HPE-bug-id: LUS-8509 Signed-off-by: Andriy Skulysh Reviewed-on: https://review.whamcloud.com/48320 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger --- lustre/ldlm/ldlm_flock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lustre/ldlm/ldlm_flock.c b/lustre/ldlm/ldlm_flock.c index 1941872..aefab40 100644 --- a/lustre/ldlm/ldlm_flock.c +++ b/lustre/ldlm/ldlm_flock.c @@ -373,13 +373,13 @@ reprocess: continue; if (intention != LDLM_PROCESS_ENQUEUE) { - reprocess_failed = 1; if (ldlm_flock_deadlock(req, lock)) { ldlm_flock_cancel_on_deadlock( req, grant_work); RETURN(LDLM_ITER_CONTINUE); } - continue; + reprocess_failed = 1; + break; } if (*flags & LDLM_FL_BLOCK_NOWAIT) { -- 1.8.3.1