From: Markus Elfring <elfring@users.sourceforge.net>
Date: Tue, 7 Apr 2015 23:43:51 +0000 (+1000)
Subject: ocfs2: one function call less in ocfs2_merge_rec_left() after error detection
X-Git-Tag: KARO-TXA5-2015-06-26~18^2~491
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=be3eaadd2eea4f077155c6f03cced1cc753f0690;p=karo-tx-linux.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>
---

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);