diff options
| author | Markus Elfring <elfring@users.sourceforge.net> | 2015-04-14 15:42:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-14 16:48:57 -0700 |
| commit | 629a3b5f0b1c09025546e110ea2b2a67335ed8c5 (patch) | |
| tree | 4e9617604769acc6a1daa2f96566c26c346ae5a5 /fs/ocfs2 | |
| parent | 992ef6e794c4d6b84e7930ee79310f066c7f6727 (diff) | |
| download | linux-629a3b5f0b1c09025546e110ea2b2a67335ed8c5.tar.gz linux-629a3b5f0b1c09025546e110ea2b2a67335ed8c5.tar.bz2 linux-629a3b5f0b1c09025546e110ea2b2a67335ed8c5.zip | |
ocfs2: one function call less in ocfs2_merge_rec_right() after error detection
ocfs2_free_path() was called by ocfs2_merge_rec_right() even if a call of
the ocfs2_get_right_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 4bdc19fb7b85..2d7f76e52c37 100644 --- a/fs/ocfs2/alloc.c +++ b/fs/ocfs2/alloc.c @@ -3370,7 +3370,7 @@ static int ocfs2_merge_rec_right(struct ocfs2_path *left_path, ret = ocfs2_get_right_path(et, left_path, &right_path); if (ret) { mlog_errno(ret); - goto out; + return ret; } right_el = path_leaf_el(right_path); |