Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 85b9e783 authored by Mark Fasheh's avatar Mark Fasheh
Browse files

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



It isn't used until ocfs2_start_trans() anyway.

Signed-off-by: default avatarMark Fasheh <mark.fasheh@oracle.com>
parent da5cbf2f

fs/ocfs2/namei.c

+1 −8
Original line number Diff line number Diff line
@@ -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;