summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno Faccini <bruno.faccini@intel.com>2013-07-22 16:07:09 (GMT)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-07-23 20:45:09 (GMT)
commitcd6b328cd0c79bba866ffb60ff447b84cfaacf3b (patch)
tree0426f44080868d9447b63fad7155d3e6406584a6
parent70b749d43d1654a4fda1b281ad08d194d6aada2b (diff)
downloadlinux-fsl-qoriq-cd6b328cd0c79bba866ffb60ff447b84cfaacf3b.tar.xz
staging/lustre/mdc: Keep resend FLocks
FLocks requests (particulary F_UNLCKs) can't be trashed upon comm problems with Server/MDS nor upon kill/exit, thus we need to keep retry/send. Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-2665 Lustre-change: http://review.whamcloud.com/6415 Signed-off-by: Bruno Faccini <bruno.faccini@intel.com> Reviewed-by: Bobi Jam <bobijam@gmail.com> Reviewed-by: Oleg Drokin <oleg.drokin@intel.com> Signed-off-by: Peng Tao <tao.peng@emc.com> Signed-off-by: Andreas Dilger <andreas.dilger@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/lustre/lustre/mdc/mdc_locks.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/staging/lustre/lustre/mdc/mdc_locks.c b/drivers/staging/lustre/lustre/mdc/mdc_locks.c
index ab88a46..803c390 100644
--- a/drivers/staging/lustre/lustre/mdc/mdc_locks.c
+++ b/drivers/staging/lustre/lustre/mdc/mdc_locks.c
@@ -823,7 +823,13 @@ 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 */
+ 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;
RETURN(rc);
}