From: David M. Richter <richterd@citi.umich.edu>
Date: Fri, 30 Jun 2006 08:56:15 +0000 (-0700)
Subject: [PATCH] knfsd: nfsd: fix misplaced fh_unlock() in nfsd_link()
X-Git-Tag: v2.6.18-rc1~266
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=270d56e536dcd37cc819a6adb51d918185411048;p=linux-2.6

[PATCH] knfsd: nfsd: fix misplaced fh_unlock() in nfsd_link()

In the event that lookup_one_len() fails in nfsd_link(), fh_unlock() is
skipped and locks are held overlong.

Patch was tested on 2.6.17-rc2 by causing lookup_one_len() to fail and
verifying that fh_unlock() gets called appropriately.

Signed-off-by: David M. Richter <richterd@citi.umich.edu>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
index b653ede37e..f916b170e1 100644
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@ -1517,14 +1517,15 @@ nfsd_link(struct svc_rqst *rqstp, struct svc_fh *ffhp,
 			err = nfserrno(err);
 	}
 
-	fh_unlock(ffhp);
 	dput(dnew);
+out_unlock:
+	fh_unlock(ffhp);
 out:
 	return err;
 
 out_nfserr:
 	err = nfserrno(err);
-	goto out;
+	goto out_unlock;
 }
 
 /*