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

[Xue jiufei]

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 <xuejiu...@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,
                               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
-- 
1.8.4.3


_______________________________________________
Ocfs2-devel mailing list
Ocfs2-devel@oss.oracle.com
https://oss.oracle.com/mailman/listinfo/ocfs2-devel