aboutsummaryrefslogtreecommitdiffstats
path: root/fs
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
parentbba67e0e3f4caba2b2b90b48ed798fb0461bcb86 (diff)
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')
-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 c68ec447ace1..d40e91e5c94a 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,
1232 if ((nd->flags & LOOKUP_CREATE) != 0) 1232 if ((nd->flags & LOOKUP_CREATE) != 0)
1233 open_flags = nd->intent.open.flags; 1233 open_flags = nd->intent.open.flags;
1234 1234
1235 lock_kernel();
1236 error = NFS_PROTO(dir)->create(dir, dentry, &attr, open_flags, nd); 1235 error = NFS_PROTO(dir)->create(dir, dentry, &attr, open_flags, nd);
1237 if (error != 0) 1236 if (error != 0)
1238 goto out_err; 1237 goto out_err;
1239 unlock_kernel();
1240 return 0; 1238 return 0;
1241out_err: 1239out_err:
1242 unlock_kernel();
1243 d_drop(dentry); 1240 d_drop(dentry);
1244 return error; 1241 return error;
1245} 1242}
@@ -1262,14 +1259,11 @@ nfs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t rdev)
1262 attr.ia_mode = mode; 1259 attr.ia_mode = mode;
1263 attr.ia_valid = ATTR_MODE; 1260 attr.ia_valid = ATTR_MODE;
1264 1261
1265 lock_kernel();
1266 status = NFS_PROTO(dir)->mknod(dir, dentry, &attr, rdev); 1262 status = NFS_PROTO(dir)->mknod(dir, dentry, &attr, rdev);
1267 if (status != 0) 1263 if (status != 0)
1268 goto out_err; 1264 goto out_err;
1269 unlock_kernel();
1270 return 0; 1265 return 0;
1271out_err: 1266out_err:
1272 unlock_kernel();
1273 d_drop(dentry); 1267 d_drop(dentry);
1274 return status; 1268 return status;
1275} 1269}
@@ -1288,15 +1282,12 @@ static int nfs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
1288 attr.ia_valid = ATTR_MODE; 1282 attr.ia_valid = ATTR_MODE;
1289 attr.ia_mode = mode | S_IFDIR; 1283 attr.ia_mode = mode | S_IFDIR;
1290 1284
1291 lock_kernel();
1292 error = NFS_PROTO(dir)->mkdir(dir, dentry, &attr); 1285 error = NFS_PROTO(dir)->mkdir(dir, dentry, &attr);
1293 if (error != 0) 1286 if (error != 0)
1294 goto out_err; 1287 goto out_err;
1295 unlock_kernel();
1296 return 0; 1288 return 0;
1297out_err: 1289out_err:
1298 d_drop(dentry); 1290 d_drop(dentry);
1299 unlock_kernel();
1300 return error; 1291 return error;
1301} 1292}
1302 1293