From d3432c60440b43d1a419c23f320da3eeef92ecda Mon Sep 17 00:00:00 2001 From: Oleg Drokin Date: Tue, 20 Aug 2013 00:54:35 -0400 Subject: [PATCH] Revert "LU-2665 mdc: Keep resend FLocks" This causes LU-3701 This reverts commit 5e9646ded8a35f1f0b7f3f1eadbd8ab4d927c4a5. --- lustre/mdc/mdc_locks.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/lustre/mdc/mdc_locks.c b/lustre/mdc/mdc_locks.c index 22c0b02..0fad743 100644 --- a/lustre/mdc/mdc_locks.c +++ b/lustre/mdc/mdc_locks.c @@ -829,13 +829,7 @@ resend: /* For flock requests we immediatelly return without further delay and let caller deal with the rest, since rest of this function metadata processing makes no sense for flock - requests anyway. But in case of problem during comms with - Server (ETIMEDOUT) or any signal/kill attempt (EINTR), we - 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)) - goto resend; + requests anyway */ RETURN(rc); } -- 1.8.3.1