summaryrefslogtreecommitdiffstats
path: root/fs/lockd
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2006-03-20 19:44:41 +0100
committerTrond Myklebust <Trond.Myklebust@netapp.com>2006-03-20 19:44:41 +0100
commit35576cba57f1c042b87d6586b3229d13067264c6 (patch)
tree705718c559911986647db9f95ad3cff85cffcff8 /fs/lockd
parentlockd: Fix Oopses due to list manipulation errors. (diff)
downloadlinux-35576cba57f1c042b87d6586b3229d13067264c6.tar.xz
linux-35576cba57f1c042b87d6586b3229d13067264c6.zip
NLM: nlmclnt_cancel_callback should accept NLM_LCK_DENIED errors
NLM_LCK_DENIED is a valid error return for an NLM_CANCEL call by the client. Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/lockd')
-rw-r--r--fs/lockd/clntproc.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c
index 3e90356b4882..c25044f3b660 100644
--- a/fs/lockd/clntproc.c
+++ b/fs/lockd/clntproc.c
@@ -750,6 +750,7 @@ static void nlmclnt_cancel_callback(struct rpc_task *task, void *data)
switch (req->a_res.status) {
case NLM_LCK_GRANTED:
case NLM_LCK_DENIED_GRACE_PERIOD:
+ case NLM_LCK_DENIED:
/* Everything's good */
break;
case NLM_LCK_DENIED_NOLOCKS: