aboutsummaryrefslogtreecommitdiff
path: root/fs/lockd/clntproc.c
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2011-06-24 17:16:40 +0900
committerPaul Mundt <lethal@linux-sh.org>2011-06-24 17:16:40 +0900
commit20733d59d5763ecd96276f868c1f39e677b3b4e2 (patch)
tree89177676a2a45afa97595ce1827630aa131c51e2 /fs/lockd/clntproc.c
parent75e1b6a84f7e2186e843da94751b6d175caf9209 (diff)
parent17e8c4e1ebf139743e3830439fa65fd906af4a43 (diff)
Merge branch 'fbdev/stable-updates'
Diffstat (limited to 'fs/lockd/clntproc.c')
-rw-r--r--fs/lockd/clntproc.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c
index adb45ec9038..e374050a911 100644
--- a/fs/lockd/clntproc.c
+++ b/fs/lockd/clntproc.c
@@ -708,7 +708,13 @@ static void nlmclnt_unlock_callback(struct rpc_task *task, void *data)
if (task->tk_status < 0) {
dprintk("lockd: unlock failed (err = %d)\n", -task->tk_status);
- goto retry_rebind;
+ switch (task->tk_status) {
+ case -EACCES:
+ case -EIO:
+ goto die;
+ default:
+ goto retry_rebind;
+ }
}
if (status == NLM_LCK_DENIED_GRACE_PERIOD) {
rpc_delay(task, NLMCLNT_GRACE_WAIT);