]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
ocfs2: one function call less in ocfs2_init_slot_info() after error detection
authorMarkus Elfring <elfring@users.sourceforge.net>
Tue, 14 Apr 2015 22:42:56 +0000 (15:42 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 14 Apr 2015 23:48:57 +0000 (16:48 -0700)
__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>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
fs/ocfs2/slot_map.c

index c5e530a9d1b12b40e2e2fc1076b03139824e6f6e..e78a203d44c832d8d638782984752cfc87e924b8 100644 (file)
@@ -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);