From: Mark Fasheh <mark.fasheh@oracle.com>
Date: Sat, 7 Oct 2006 01:40:41 +0000 (-0700)
Subject: ocfs2: Don't allocate handle early in ocfs2_rename()
X-Git-Tag: v2.6.20-rc1~34^2~40^2~4^2~16
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=85b9e783cbc8cf4acc7bfaa76f37ea26b426f514;p=linux-2.6

ocfs2: Don't allocate handle early in ocfs2_rename()

It isn't used until ocfs2_start_trans() anyway.

Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
---

diff --git a/fs/ocfs2/namei.c b/fs/ocfs2/namei.c
index ca012446d8..8d03ef4468 100644
--- a/fs/ocfs2/namei.c
+++ b/fs/ocfs2/namei.c
@@ -1114,13 +1114,6 @@ static int ocfs2_rename(struct inode *old_dir,
 		rename_lock = 1;
 	}
 
-	handle = ocfs2_alloc_handle(osb);
-	if (handle == NULL) {
-		status = -ENOMEM;
-		mlog_errno(status);
-		goto bail;
-	}
-
 	/* if old and new are the same, this'll just do one lock. */
 	status = ocfs2_double_lock(osb, &old_dir_bh, old_dir,
 				   &new_dir_bh, new_dir);
@@ -1291,7 +1284,7 @@ static int ocfs2_rename(struct inode *old_dir,
 		}
 	}
 
-	handle = ocfs2_start_trans(osb, handle, OCFS2_RENAME_CREDITS);
+	handle = ocfs2_start_trans(osb, NULL, OCFS2_RENAME_CREDITS);
 	if (IS_ERR(handle)) {
 		status = PTR_ERR(handle);
 		handle = NULL;