ocfs2: return error when ocfs2_figure_merge_contig_type() fails
authorXue jiufei <xuejiufei@huawei.com>
Wed, 24 Jun 2015 23:55:07 +0000 (16:55 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 25 Jun 2015 00:49:39 +0000 (17:49 -0700)
commit9f99ad08612ac37f3b8847b9b2e6e95a2a81ed4b
tree6907d3f30bfee6983b8f953b52120844ced831ec
parent345dc681bd9acc8d7fdb6f5d3e2419c010f00bf6
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>
fs/ocfs2/alloc.c