From: Trond Myklebust Date: Mon, 20 Mar 2006 18:44:41 +0000 (-0500) Subject: NLM: nlmclnt_cancel_callback should accept NLM_LCK_DENIED errors X-Git-Tag: v2.6.17-rc1~667^2~32 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=35576cba57f1c042b87d6586b3229d13067264c6;p=linux-2.6-omap-h63xx.git 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 --- diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c index 3e90356b488..c25044f3b66 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: