summaryrefslogtreecommitdiff
path: root/fs/nfs/dir.c
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2008-06-11 15:50:50 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2008-07-15 18:10:53 -0400
commitf1e2eda23513b68003202bddf1f84158baad8844 (patch)
tree88e56131a18a1310e0d4a8bcabfce629496ca7d3 /fs/nfs/dir.c
parentbba67e0e3f4caba2b2b90b48ed798fb0461bcb86 (diff)
downloadlinux-3.10-f1e2eda23513b68003202bddf1f84158baad8844.tar.gz
linux-3.10-f1e2eda23513b68003202bddf1f84158baad8844.tar.bz2
linux-3.10-f1e2eda23513b68003202bddf1f84158baad8844.zip
NFS: Remove the BKL from the inode creation operations
nfs_instantiate() does not require the BKL, neither do the attribute updates or the RPC code. Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/dir.c')
-rw-r--r--fs/nfs/dir.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index c68ec447ace..d40e91e5c94 100644
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -1232,14 +1232,11 @@ static int nfs_create(struct inode *dir, struct dentry *dentry, int mode,
if ((nd->flags & LOOKUP_CREATE) != 0)
open_flags = nd->intent.open.flags;
- lock_kernel();
error = NFS_PROTO(dir)->create(dir, dentry, &attr, open_flags, nd);
if (error != 0)
goto out_err;
- unlock_kernel();
return 0;
out_err:
- unlock_kernel();
d_drop(dentry);
return error;
}
@@ -1262,14 +1259,11 @@ nfs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t rdev)
attr.ia_mode = mode;
attr.ia_valid = ATTR_MODE;
- lock_kernel();
status = NFS_PROTO(dir)->mknod(dir, dentry, &attr, rdev);
if (status != 0)
goto out_err;
- unlock_kernel();
return 0;
out_err:
- unlock_kernel();
d_drop(dentry);
return status;
}
@@ -1288,15 +1282,12 @@ static int nfs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
attr.ia_valid = ATTR_MODE;
attr.ia_mode = mode | S_IFDIR;
- lock_kernel();
error = NFS_PROTO(dir)->mkdir(dir, dentry, &attr);
if (error != 0)
goto out_err;
- unlock_kernel();
return 0;
out_err:
d_drop(dentry);
- unlock_kernel();
return error;
}