diff options
| author | Mark Fasheh <mark.fasheh@oracle.com> | 2006-10-06 18:40:41 -0700 |
|---|---|---|
| committer | Mark Fasheh <mark.fasheh@oracle.com> | 2006-12-01 18:27:53 -0800 |
| commit | 85b9e783cbc8cf4acc7bfaa76f37ea26b426f514 (patch) | |
| tree | b8ef170b91e476168cc1b6c71ae3ff500fe3e1a4 /fs/ocfs2 | |
| parent | da5cbf2f9df922cfdafa39351691fa83517f1e25 (diff) | |
| download | linux-stable-85b9e783cbc8cf4acc7bfaa76f37ea26b426f514.tar.gz linux-stable-85b9e783cbc8cf4acc7bfaa76f37ea26b426f514.tar.bz2 linux-stable-85b9e783cbc8cf4acc7bfaa76f37ea26b426f514.zip | |
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>
Diffstat (limited to 'fs/ocfs2')
| -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, 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; |