The patch titled
knfsd: nfsd: fix misplaced fh_unlock() in nfsd_link()
has been removed from the -mm tree. Its filename is
knfsd-nfsd-fix-misplaced-fh_unlock-in-nfsd_link.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: knfsd: nfsd: fix misplaced fh_unlock() in nfsd_link()
From: David M. Richter <richterd@xxxxxxxxxxxxxx>
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@xxxxxxxxxxxxxx>
Signed-off-by: J. Bruce Fields <bfields@xxxxxxxxxxxxxx>
Signed-off-by: Neil Brown <neilb@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
fs/nfsd/vfs.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff -puN fs/nfsd/vfs.c~knfsd-nfsd-fix-misplaced-fh_unlock-in-nfsd_link fs/nfsd/vfs.c
--- a/fs/nfsd/vfs.c~knfsd-nfsd-fix-misplaced-fh_unlock-in-nfsd_link
+++ a/fs/nfsd/vfs.c
@@ -1517,14 +1517,15 @@ nfsd_link(struct svc_rqst *rqstp, struct
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;
}
/*
_
Patches currently in -mm which might be from richterd@xxxxxxxxxxxxxx are
origin.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
