tree 6907d3f30bfee6983b8f953b52120844ced831ec
parent 345dc681bd9acc8d7fdb6f5d3e2419c010f00bf6
author Xue jiufei <xuejiufei@huawei.com> 1435190107 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1435193379 -0700

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>