From: Markus Elfring <elfring@users.sourceforge.net>
Date: Tue, 14 Apr 2015 22:42:53 +0000 (-0700)
Subject: ocfs2: one function call less in ocfs2_merge_rec_right() after error detection
X-Git-Tag: omap-for-v4.1/fixes-rc1~151^2~113
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=629a3b5f0b1c09025546e110ea2b2a67335ed8c5;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed