From: Markus Elfring <elfring@users.sourceforge.net>
Date: Tue, 14 Apr 2015 22:42:51 +0000 (-0700)
Subject: ocfs2: one function call less in ocfs2_merge_rec_left() after error detection
X-Git-Tag: firefly_0821_release~176^2~1984^2~114
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=992ef6e794c4d6b84e7930ee79310f066c7f6727;p=firefly-linux-kernel-4.4.55.git

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

ocfs2_free_path() was called by ocfs2_merge_rec_left() even if a call of
the ocfs2_get_left_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>
---

diff --git a/fs/ocfs2/alloc.c b/fs/ocfs2/alloc.c
index 370b4ea4c23a..4bdc19fb7b85 100644
--- a/fs/ocfs2/alloc.c
+++ b/fs/ocfs2/alloc.c
@@ -3535,7 +3535,7 @@ static int ocfs2_merge_rec_left(struct ocfs2_path *right_path,
 		ret = ocfs2_get_left_path(et, right_path, &left_path);
 		if (ret) {
 			mlog_errno(ret);
-			goto out;
+			return ret;
 		}
 
 		left_el = path_leaf_el(left_path);