LU-3701 ldlm: refine LU-2665 patch for POSIX compliance

[fs/lustre-release.git] / lustre / mdc / mdc_locks.c

diff --git a/lustre/mdc/mdc_locks.c b/lustre/mdc/mdc_locks.c
index 12046eb..abc2b25 100644 (file)
--- a/lustre/mdc/mdc_locks.c
+++ b/lustre/mdc/mdc_locks.c
@@ -908,7 +908,9 @@ resend:
                   can not rely on caller and this mainly for F_UNLCKs
                   (explicits or automatically generated by Kernel to clean
                   current FLocks upon exit) that can't be trashed */
-               if ((rc == -EINTR) || (rc == -ETIMEDOUT))
+               if (((rc == -EINTR) || (rc == -ETIMEDOUT)) &&
+                   (einfo->ei_type == LDLM_FLOCK) &&
+                   (einfo->ei_mode == LCK_NL))
                        goto resend;
                 RETURN(rc);
         }