diff --git a/[refs] b/[refs] index 7f6fb50c5d12..e4b7c939b594 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4c060b531006e0711db32a132d6ac7661594b280 +refs/heads/master: 35576cba57f1c042b87d6586b3229d13067264c6 diff --git a/trunk/fs/lockd/clntproc.c b/trunk/fs/lockd/clntproc.c index 3e90356b4882..c25044f3b660 100644 --- a/trunk/fs/lockd/clntproc.c +++ b/trunk/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: