---

yaml
---
r: 42371
b: refs/heads/master
c: e3a8213
h: refs/heads/master
i:
  42369: 0f938c8
  42367: 3c5adf1
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e08dc8b9808f06d412904db4d67434bf19984752
+refs/heads/master: e3a821385984e57d5dd1b0e7292761abb0ea4dd9

trunk/fs/ocfs2/namei.c

@@ -333,20 +333,20 @@ 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;
 		mlog_errno(status);
 		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 @@ static int ocfs2_mknod(struct inode *dir,
 	if (handle)
 		ocfs2_commit_trans(handle);
 
+	ocfs2_meta_unlock(dir, 1);
+
 	if (status == -ENOSPC)
 		mlog(0, "Disk is full\n");