---

yaml --- r: 18968 b: refs/heads/master c: 7fcd533 h: refs/heads/master v: v3
git-mirror · Jan 19, 2006 · ed1271f · ed1271f
1 parent 47cff28
commit ed1271f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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;
 	}