Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f99ad08 authored by Xue jiufei's avatar Xue jiufei Committed by Linus Torvalds
Browse files

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: default avatarjoyce.xue <xuejiufei@huawei.com>
Cc: Mark Fasheh <mfasheh@suse.com>
Cc: Joel Becker <jlbec@evilplan.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 345dc681

fs/ocfs2/alloc.c

+24 −10
Original line number Diff line number Diff line
@@ -4311,13 +4311,13 @@ static int ocfs2_do_insert_extent(handle_t *handle, 
	return ret;

}



static enum ocfs2_contig_type

ocfs2_figure_merge_contig_type(struct ocfs2_extent_tree *et,

static int ocfs2_figure_merge_contig_type(struct ocfs2_extent_tree *et,

			       struct ocfs2_path *path,

			       struct ocfs2_extent_list *el, int index,

			       struct ocfs2_extent_rec *split_rec)

			       struct ocfs2_extent_rec *split_rec,

			       struct ocfs2_merge_ctxt *ctxt)

{

	int status;

	int status = 0;

	enum ocfs2_contig_type ret = CONTIG_NONE;

	u32 left_cpos, right_cpos;

	struct ocfs2_extent_rec *rec = NULL;
@@ -4336,8 +4336,11 @@ ocfs2_figure_merge_contig_type(struct ocfs2_extent_tree *et, 


		if (left_cpos != 0) {

			left_path = ocfs2_new_path_from_path(path);

			if (!left_path)

			if (!left_path) {

				status = -ENOMEM;

				mlog_errno(status);

				goto exit;

			}



			status = ocfs2_find_path(et->et_ci, left_path,

						 left_cpos);
@@ -4392,8 +4395,11 @@ ocfs2_figure_merge_contig_type(struct ocfs2_extent_tree *et, 
			goto free_left_path;



		right_path = ocfs2_new_path_from_path(path);

		if (!right_path)

		if (!right_path) {

			status = -ENOMEM;

			mlog_errno(status);

			goto free_left_path;

		}



		status = ocfs2_find_path(et->et_ci, right_path, right_cpos);

		if (status)
@@ -4433,7 +4439,10 @@ ocfs2_figure_merge_contig_type(struct ocfs2_extent_tree *et, 
free_left_path:

	ocfs2_free_path(left_path);

exit:

	return ret;

	if (status == 0)

		ctxt->c_contig_type = ret;



	return status;

}



static void ocfs2_figure_contig_type(struct ocfs2_extent_tree *et,
@@ -5039,9 +5048,14 @@ int ocfs2_split_extent(handle_t *handle, 
		goto out;

	}



	ctxt.c_contig_type = ocfs2_figure_merge_contig_type(et, path, el,

	ret = ocfs2_figure_merge_contig_type(et, path, el,

					     split_index,

							    split_rec);

					     split_rec,

					     &ctxt);

	if (ret) {

		mlog_errno(ret);

		goto out;

	}



	/*

	 * The core merge / split code wants to know how much room is