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/nfs/dir.c | |
| parent | fa6dc9dc59c3a76fd209a97c8cf37395980fb903 (diff) | |
| download | linux-stable-4d80f2ecd506d9732ad94a6da104580bb47680d6.tar.gz linux-stable-4d80f2ecd506d9732ad94a6da104580bb47680d6.tar.bz2 linux-stable-4d80f2ecd506d9732ad94a6da104580bb47680d6.zip | |
NFS: Remove the BKL from the permission checking code
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/dir.c')
| -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) } force_lookup: - lock_kernel(); - if (!NFS_PROTO(inode)->access) goto out_notsup; @@ -1993,7 +1991,6 @@ force_lookup: 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 @@ out_notsup: res = nfs_revalidate_inode(NFS_SERVER(inode), inode); if (res == 0) res = generic_permission(inode, mask, NULL); - unlock_kernel(); goto out; } |