diff options
| author | Markus Elfring <elfring@users.sourceforge.net> | 2015-04-14 15:42:51 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-14 16:48:57 -0700 |
| commit | 992ef6e794c4d6b84e7930ee79310f066c7f6727 (patch) | |
| tree | 9ea31e043c3423a06c86c8f9a82496102f6e0f2d /fs/ocfs2 | |
| parent | 06a269ccdf0550671667f5cfa00bdabb6bf05259 (diff) | |
| download | linux-992ef6e794c4d6b84e7930ee79310f066c7f6727.tar.gz linux-992ef6e794c4d6b84e7930ee79310f066c7f6727.tar.bz2 linux-992ef6e794c4d6b84e7930ee79310f066c7f6727.zip | |
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>
Diffstat (limited to 'fs/ocfs2')
| -rw-r--r-- | fs/ocfs2/alloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); |