aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorMark Fasheh <mark.fasheh@oracle.com>2006-10-05 19:04:17 -0400
committerMark Fasheh <mark.fasheh@oracle.com>2006-12-01 21:27:12 -0500
commite3a821385984e57d5dd1b0e7292761abb0ea4dd9 (patch)
tree2a833a3780e8eddbf4b502ec1012cc9854019fe0 /fs
parente08dc8b9808f06d412904db4d67434bf19984752 (diff)
ocfs2: don't pass handle to ocfs2_meta_lock() in ocfs2_mknod()
Take and drop the locks directly. Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/ocfs2/namei.c16
1 files changed, 9 insertions, 7 deletions
diff --git a/fs/ocfs2/namei.c b/fs/ocfs2/namei.c
index a57b751d4f40..702f0c30cda4 100644
--- a/fs/ocfs2/namei.c
+++ b/fs/ocfs2/namei.c
@@ -333,6 +333,13 @@ static int ocfs2_mknod(struct inode *dir,
333 /* get our super block */ 333 /* get our super block */
334 osb = OCFS2_SB(dir->i_sb); 334 osb = OCFS2_SB(dir->i_sb);
335 335
336 status = ocfs2_meta_lock(dir, NULL, &parent_fe_bh, 1);
337 if (status < 0) {
338 if (status != -ENOENT)
339 mlog_errno(status);
340 return status;
341 }
342
336 handle = ocfs2_alloc_handle(osb); 343 handle = ocfs2_alloc_handle(osb);
337 if (handle == NULL) { 344 if (handle == NULL) {
338 status = -ENOMEM; 345 status = -ENOMEM;
@@ -340,13 +347,6 @@ static int ocfs2_mknod(struct inode *dir,
340 goto leave; 347 goto leave;
341 } 348 }
342 349
343 status = ocfs2_meta_lock(dir, handle, &parent_fe_bh, 1);
344 if (status < 0) {
345 if (status != -ENOENT)
346 mlog_errno(status);
347 goto leave;
348 }
349
350 if (S_ISDIR(mode) && (dir->i_nlink >= OCFS2_LINK_MAX)) { 350 if (S_ISDIR(mode) && (dir->i_nlink >= OCFS2_LINK_MAX)) {
351 status = -EMLINK; 351 status = -EMLINK;
352 goto leave; 352 goto leave;
@@ -455,6 +455,8 @@ leave:
455 if (handle) 455 if (handle)
456 ocfs2_commit_trans(handle); 456 ocfs2_commit_trans(handle);
457 457
458 ocfs2_meta_unlock(dir, 1);
459
458 if (status == -ENOSPC) 460 if (status == -ENOSPC)
459 mlog(0, "Disk is full\n"); 461 mlog(0, "Disk is full\n");
460 462