Commit 629a3b5f authored Apr 14, 2015 by Markus Elfring Committed by Linus Torvalds Apr 14, 2015

ocfs2: one function call less in ocfs2_merge_rec_right() after error detection



ocfs2_free_path() was called by ocfs2_merge_rec_right() even if a call of
the ocfs2_get_right_path() function failed.

Return from this implementation directly after corresponding
exception handling.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Cc: Mark Fasheh <mfasheh@suse.com>
Cc: Joel Becker <jlbec@evilplan.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 992ef6e7

fs/ocfs2/alloc.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -3370,7 +3370,7 @@ static int ocfs2_merge_rec_right(struct ocfs2_path *left_path,
		ret = ocfs2_get_right_path(et, left_path, &right_path);
		if (ret) {
		mlog_errno(ret);
		goto out;
		return ret;
		}

		right_el = path_leaf_el(right_path);