diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-06-11 15:44:18 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-07-15 18:10:52 -0400 |
commit | 4d80f2ecd506d9732ad94a6da104580bb47680d6 (patch) | |
tree | 26cb6bb08a53eae18dcf046b1041f20b5c9a9f8d /fs | |
parent | fa6dc9dc59c3a76fd209a97c8cf37395980fb903 (diff) |
NFS: Remove the BKL from the permission checking code
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/nfs/dir.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c index d6ec1c85995a..73e0f9740dd1 100644 --- a/fs/nfs/dir.c +++ b/fs/nfs/dir.c | |||
@@ -1982,8 +1982,6 @@ int nfs_permission(struct inode *inode, int mask, struct nameidata *nd) | |||
1982 | } | 1982 | } |
1983 | 1983 | ||
1984 | force_lookup: | 1984 | force_lookup: |
1985 | lock_kernel(); | ||
1986 | |||
1987 | if (!NFS_PROTO(inode)->access) | 1985 | if (!NFS_PROTO(inode)->access) |
1988 | goto out_notsup; | 1986 | goto out_notsup; |
1989 | 1987 | ||
@@ -1993,7 +1991,6 @@ force_lookup: | |||
1993 | put_rpccred(cred); | 1991 | put_rpccred(cred); |
1994 | } else | 1992 | } else |
1995 | res = PTR_ERR(cred); | 1993 | res = PTR_ERR(cred); |
1996 | unlock_kernel(); | ||
1997 | out: | 1994 | out: |
1998 | dfprintk(VFS, "NFS: permission(%s/%ld), mask=0x%x, res=%d\n", | 1995 | dfprintk(VFS, "NFS: permission(%s/%ld), mask=0x%x, res=%d\n", |
1999 | inode->i_sb->s_id, inode->i_ino, mask, res); | 1996 | inode->i_sb->s_id, inode->i_ino, mask, res); |
@@ -2002,7 +1999,6 @@ out_notsup: | |||
2002 | res = nfs_revalidate_inode(NFS_SERVER(inode), inode); | 1999 | res = nfs_revalidate_inode(NFS_SERVER(inode), inode); |
2003 | if (res == 0) | 2000 | if (res == 0) |
2004 | res = generic_permission(inode, mask, NULL); | 2001 | res = generic_permission(inode, mask, NULL); |
2005 | unlock_kernel(); | ||
2006 | goto out; | 2002 | goto out; |
2007 | } | 2003 | } |
2008 | 2004 | ||