From: Mark Fasheh <mark.fasheh@oracle.com>
Date: Thu, 5 Oct 2006 23:04:17 +0000 (-0700)
Subject: ocfs2: don't pass handle to ocfs2_meta_lock() in ocfs2_mknod()
X-Git-Tag: v2.6.20-rc1~34^2~40^2~4^2~23
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e3a821385984e57d5dd1b0e7292761abb0ea4dd9;p=linux-2.6

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>
---

diff --git a/fs/ocfs2/namei.c b/fs/ocfs2/namei.c
index a57b751d4f..702f0c30cd 100644
--- a/fs/ocfs2/namei.c
+++ b/fs/ocfs2/namei.c
@@ -333,6 +333,13 @@ static int ocfs2_mknod(struct inode *dir,
 	/* get our super block */
 	osb = OCFS2_SB(dir->i_sb);
 
+	status = ocfs2_meta_lock(dir, NULL, &parent_fe_bh, 1);
+	if (status < 0) {
+		if (status != -ENOENT)
+			mlog_errno(status);
+		return status;
+	}
+
 	handle = ocfs2_alloc_handle(osb);
 	if (handle == NULL) {
 		status = -ENOMEM;
@@ -340,13 +347,6 @@ static int ocfs2_mknod(struct inode *dir,
 		goto leave;
 	}
 
-	status = ocfs2_meta_lock(dir, handle, &parent_fe_bh, 1);
-	if (status < 0) {
-		if (status != -ENOENT)
-			mlog_errno(status);
-		goto leave;
-	}
-
 	if (S_ISDIR(mode) && (dir->i_nlink >= OCFS2_LINK_MAX)) {
 		status = -EMLINK;
 		goto leave;
@@ -455,6 +455,8 @@ leave:
 	if (handle)
 		ocfs2_commit_trans(handle);
 
+	ocfs2_meta_unlock(dir, 1);
+
 	if (status == -ENOSPC)
 		mlog(0, "Disk is full\n");