From: Xue jiufei <xuejiufei@huawei.com>
Date: Wed, 24 Jun 2015 23:55:07 +0000 (-0700)
Subject: ocfs2: return error when ocfs2_figure_merge_contig_type() fails
X-Git-Tag: omap-for-v4.2/fixes-rc1^2~125^2~80
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9f99ad08612ac37f3b8847b9b2e6e95a2a81ed4b;p=pandora-kernel.git

ocfs2: return error when ocfs2_figure_merge_contig_type() fails

ocfs2_figure_merge_contig_type() still returns CONTIG_NONE when some error
occurs which will cause an unpredictable error.  So return a proper errno
when ocfs2_figure_merge_contig_type() fails.

Signed-off-by: joyce.xue <xuejiufei@huawei.com>
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