diff options
author | Mark Fasheh <mark.fasheh@oracle.com> | 2006-10-06 21:40:41 -0400 |
---|---|---|
committer | Mark Fasheh <mark.fasheh@oracle.com> | 2006-12-01 21:27:53 -0500 |
commit | 85b9e783cbc8cf4acc7bfaa76f37ea26b426f514 (patch) | |
tree | b8ef170b91e476168cc1b6c71ae3ff500fe3e1a4 | |
parent | da5cbf2f9df922cfdafa39351691fa83517f1e25 (diff) |
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>
-rw-r--r-- | fs/ocfs2/namei.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/fs/ocfs2/namei.c b/fs/ocfs2/namei.c index ca012446d8e7..8d03ef446868 100644 --- a/fs/ocfs2/namei.c +++ b/fs/ocfs2/namei.c | |||
@@ -1114,13 +1114,6 @@ static int ocfs2_rename(struct inode *old_dir, | |||
1114 | rename_lock = 1; | 1114 | rename_lock = 1; |
1115 | } | 1115 | } |
1116 | 1116 | ||
1117 | handle = ocfs2_alloc_handle(osb); | ||
1118 | if (handle == NULL) { | ||
1119 | status = -ENOMEM; | ||
1120 | mlog_errno(status); | ||
1121 | goto bail; | ||
1122 | } | ||
1123 | |||
1124 | /* if old and new are the same, this'll just do one lock. */ | 1117 | /* if old and new are the same, this'll just do one lock. */ |
1125 | status = ocfs2_double_lock(osb, &old_dir_bh, old_dir, | 1118 | status = ocfs2_double_lock(osb, &old_dir_bh, old_dir, |
1126 | &new_dir_bh, new_dir); | 1119 | &new_dir_bh, new_dir); |
@@ -1291,7 +1284,7 @@ static int ocfs2_rename(struct inode *old_dir, | |||
1291 | } | 1284 | } |
1292 | } | 1285 | } |
1293 | 1286 | ||
1294 | handle = ocfs2_start_trans(osb, handle, OCFS2_RENAME_CREDITS); | 1287 | handle = ocfs2_start_trans(osb, NULL, OCFS2_RENAME_CREDITS); |
1295 | if (IS_ERR(handle)) { | 1288 | if (IS_ERR(handle)) { |
1296 | status = PTR_ERR(handle); | 1289 | status = PTR_ERR(handle); |
1297 | handle = NULL; | 1290 | handle = NULL; |