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

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

__ocfs2_free_slot_info() was called by ocfs2_init_slot_info() even if a
call of the kzalloc() 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/slot_map.c b/fs/ocfs2/slot_map.c
index c5e530a9d1b1..e78a203d44c8 100644
--- a/fs/ocfs2/slot_map.c
+++ b/fs/ocfs2/slot_map.c
@@ -427,7 +427,7 @@ int ocfs2_init_slot_info(struct ocfs2_super *osb)
 	if (!si) {
 		status = -ENOMEM;
 		mlog_errno(status);
-		goto bail;
+		return status;
 	}
 
 	si->si_extended = ocfs2_uses_extended_slot_map(osb);