[Ocfs2-devel] [PATCH] ocfs2: return error while ocfs2_figure_merge_contig_type failing

[Xue jiufei]

On 2015/4/21 10:22, Joseph Qi wrote:
> On 2015/4/17 17:09, Xue jiufei wrote:
>> Now function ocfs2_figure_merge_contig_type() still return CONTIG_NONE
>> when some error occurs which will cause unpredictable error.
>> So return error while ocfs2_figure_merge_contig_type failing.
>>
>> Signed-off-by: joyce.xue <xuejiufei at huawei.com>
>> ---
>>  fs/ocfs2/alloc.c | 22 +++++++++++++++-------
>>  1 file changed, 15 insertions(+), 7 deletions(-)
>>
>> diff --git a/fs/ocfs2/alloc.c b/fs/ocfs2/alloc.c
>> index 044158b..aa039f2 100644
>> --- a/fs/ocfs2/alloc.c
>> +++ b/fs/ocfs2/alloc.c
>> @@ -4313,11 +4313,11 @@ out:
>>  	return ret;
>>  }
>>  
>> -static enum ocfs2_contig_type
>> -ocfs2_figure_merge_contig_type(struct ocfs2_extent_tree *et,
>> +int ocfs2_figure_merge_contig_type(struct ocfs2_extent_tree *et,
> It can still be static.
yes, that's right. Thanks for your advice. I will send version 2 later.
> 
>>  			       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;
>>  	enum ocfs2_contig_type ret = CONTIG_NONE;
>> @@ -4431,12 +4431,15 @@ ocfs2_figure_merge_contig_type(struct ocfs2_extent_tree *et,
>>  	}
>>  
>>  out:
>> +	if (status == 0)
>> +		ctxt->c_contig_type = ret;
>> +
>>  	if (left_path)
>>  		ocfs2_free_path(left_path);
>>  	if (right_path)
>>  		ocfs2_free_path(right_path);
>>  
>> -	return ret;
>> +	return status;
>>  }
>>  
>>  static void ocfs2_figure_contig_type(struct ocfs2_extent_tree *et,
>> @@ -5042,9 +5045,14 @@ int ocfs2_split_extent(handle_t *handle,
>>  		goto out;
>>  	}
>>  
>> -	ctxt.c_contig_type = ocfs2_figure_merge_contig_type(et, path, el,
>> -							    split_index,
>> -							    split_rec);
>> +	ret =  ocfs2_figure_merge_contig_type(et, path, el,
>> +					      split_index,
>> +					      split_rec,
>> +					      &ctxt);
>> +	if (ret) {
>> +		mlog_errno(ret);
>> +		goto out;
>> +	}
>>  
>>  	/*
>>  	 * The core merge / split code wants to know how much room is
>>
> 
> 
> 
> .
>