---

yaml --- r: 101963 b: refs/heads/master c: 4d80f2e h: refs/heads/master i: 101961: d4edc87 101959: 186e0b1 v: v3
git-mirror · Jul 15, 2008 · a3861a9 · a3861a9
1 parent a6570c3
commit a3861a9
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fa6dc9dc59c3a76fd209a97c8cf37395980fb903
+refs/heads/master: 4d80f2ecd506d9732ad94a6da104580bb47680d6
diff --git a/trunk/fs/nfs/dir.c b/trunk/fs/nfs/dir.c
@@ -1982,8 +1982,6 @@ int nfs_permission(struct inode *inode, int mask, struct nameidata *nd)
 	}
 
 force_lookup:
-	lock_kernel();
-
 	if (!NFS_PROTO(inode)->access)
 		goto out_notsup;
 
@@ -1993,7 +1991,6 @@ int nfs_permission(struct inode *inode, int mask, struct nameidata *nd)
 		put_rpccred(cred);
 	} else
 		res = PTR_ERR(cred);
-	unlock_kernel();
 out:
 	dfprintk(VFS, "NFS: permission(%s/%ld), mask=0x%x, res=%d\n",
 		inode->i_sb->s_id, inode->i_ino, mask, res);
@@ -2002,7 +1999,6 @@ int nfs_permission(struct inode *inode, int mask, struct nameidata *nd)
 	res = nfs_revalidate_inode(NFS_SERVER(inode), inode);
 	if (res == 0)
 		res = generic_permission(inode, mask, NULL);
-	unlock_kernel();
 	goto out;
 }