LU-7173 mdt: intent vs unlink race

[fs/lustre-release.git] / lustre / ldlm / ldlm_lockd.c

diff --git a/lustre/ldlm/ldlm_lockd.c b/lustre/ldlm/ldlm_lockd.c
index 72a6fb2..5060265 100644 (file)
--- a/lustre/ldlm/ldlm_lockd.c
+++ b/lustre/ldlm/ldlm_lockd.c
@@ -1515,7 +1515,7 @@ existing_lock:
                        }
                }
 
-               if (rc != 0) {
+               if (rc != 0 && !(flags & LDLM_FL_RESENT)) {
                        if (lock->l_export) {
                                ldlm_lock_cancel(lock);
                        } else {