Explorar o código

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>
Markus Elfring %!s(int64=10) %!d(string=hai) anos
pai
achega
992ef6e794
Modificáronse 1 ficheiros con 1 adicións e 1 borrados
  1. 1 1
      fs/ocfs2/alloc.c

+ 1 - 1
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);
 		ret = ocfs2_get_left_path(et, right_path, &left_path);
 		if (ret) {
 		if (ret) {
 			mlog_errno(ret);
 			mlog_errno(ret);
-			goto out;
+			return ret;
 		}
 		}
 
 
 		left_el = path_leaf_el(left_path);
 		left_el = path_leaf_el(left_path);