From: Neil Brown <neilb@suse.de>

vfs_setattr and vfs_removexattr both claim and release i_sem, so
nfsd_set_posix_acl shouldn't call fh_lock any more (it won't already be
locked).

Signed-off-by: Neil Brown <neilb@suse.de>
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 fs/nfsd/vfs.c |    2 --
 1 files changed, 2 deletions(-)

diff -puN fs/nfsd/vfs.c~add-vfs_-helpers-for-xattr-operations-fix-2 fs/nfsd/vfs.c
--- devel/fs/nfsd/vfs.c~add-vfs_-helpers-for-xattr-operations-fix-2	2005-11-20 15:46:16.000000000 -0800
+++ devel-akpm/fs/nfsd/vfs.c	2005-11-20 15:46:16.000000000 -0800
@@ -1921,8 +1921,6 @@ nfsd_set_posix_acl(struct svc_fh *fhp, i
 	} else
 		size = 0;
 
-	if (!fhp->fh_locked)
-		fh_lock(fhp);  /* unlocking is done automatically */
 	if (size)
 		error = vfs_setxattr(fhp->fh_dentry, name, value, size, 0);
 	else {
_