From ed1271f9f6e4d7c8b9e2e7de8d69931f474b4621 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Wed, 18 Jan 2006 17:43:48 -0800 Subject: [PATCH] --- yaml --- r: 18968 b: refs/heads/master c: 7fcd53303de8dbbed863f6471ca92eb96a1faa28 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/nfsd/nfs4state.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index f42d60cc9917..4c9065ad48de 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: de1ae286f863c46b7c8f9bed97df17d7f5ea510c +refs/heads/master: 7fcd53303de8dbbed863f6471ca92eb96a1faa28 diff --git a/trunk/fs/nfsd/nfs4state.c b/trunk/fs/nfsd/nfs4state.c index 856ed4fd662b..1143cfb64549 100644 --- a/trunk/fs/nfsd/nfs4state.c +++ b/trunk/fs/nfsd/nfs4state.c @@ -2761,7 +2761,10 @@ nfsd4_lock(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_lock goto conflicting_lock; case (EDEADLK): status = nfserr_deadlock; + dprintk("NFSD: nfsd4_lock: posix_lock_file() failed! status %d\n",status); + goto out; default: + status = nfserrno(status); dprintk("NFSD: nfsd4_lock: posix_lock_file() failed! status %d\n",status); goto out; }