Skip to content

Commit

Permalink
NFS: Remove BKL usage from open()
Browse files Browse the repository at this point in the history
All the NFSv4 stateful operations are already protected by other locks (in
particular by the rpc_sequence locks.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
  • Loading branch information
Trond Myklebust authored and Trond Myklebust committed Jul 15, 2008
1 parent b6a2e56 commit bba67e0
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 10 deletions.
6 changes: 0 additions & 6 deletions fs/nfs/dir.c
Original file line number Diff line number Diff line change
Expand Up @@ -139,10 +139,8 @@ nfs_opendir(struct inode *inode, struct file *filp)

nfs_inc_stats(inode, NFSIOS_VFSOPEN);

lock_kernel();
/* Call generic open code in order to cache credentials */
res = nfs_open(inode, filp);
unlock_kernel();
return res;
}

Expand Down Expand Up @@ -1019,9 +1017,7 @@ static struct dentry *nfs_atomic_lookup(struct inode *dir, struct dentry *dentry
}

/* Open the file on the server */
lock_kernel();
res = nfs4_atomic_open(dir, dentry, nd);
unlock_kernel();
if (IS_ERR(res)) {
error = PTR_ERR(res);
switch (error) {
Expand Down Expand Up @@ -1083,9 +1079,7 @@ static int nfs_open_revalidate(struct dentry *dentry, struct nameidata *nd)
* operations that change the directory. We therefore save the
* change attribute *before* we do the RPC call.
*/
lock_kernel();
ret = nfs4_open_revalidate(dir, dentry, openflags, nd);
unlock_kernel();
out:
dput(parent);
if (!ret)
Expand Down
2 changes: 0 additions & 2 deletions fs/nfs/file.c
Original file line number Diff line number Diff line change
Expand Up @@ -128,9 +128,7 @@ nfs_file_open(struct inode *inode, struct file *filp)
return res;

nfs_inc_stats(inode, NFSIOS_VFSOPEN);
lock_kernel();
res = nfs_open(inode, filp);
unlock_kernel();
return res;
}

Expand Down
2 changes: 0 additions & 2 deletions fs/nfs/nfs4proc.c
Original file line number Diff line number Diff line change
Expand Up @@ -451,9 +451,7 @@ static struct nfs4_state *nfs4_try_open_cached(struct nfs4_opendata *opendata)
/* Save the delegation */
memcpy(stateid.data, delegation->stateid.data, sizeof(stateid.data));
rcu_read_unlock();
lock_kernel();
ret = nfs_may_open(state->inode, state->owner->so_cred, open_mode);
unlock_kernel();
if (ret != 0)
goto out;
ret = -EAGAIN;
Expand Down

0 comments on commit bba67e0

Please sign in to comment.