Loading fs/ocfs2/alloc.c +16 −24 Original line number Diff line number Diff line Loading @@ -2807,20 +2807,13 @@ static int ocfs2_try_to_merge_extent(struct inode *inode, struct ocfs2_merge_ctxt *ctxt) { int ret = 0, delete_tail_recs = 0; int ret = 0; struct ocfs2_extent_list *el = path_leaf_el(left_path); struct ocfs2_extent_rec *rec = &el->l_recs[split_index]; BUG_ON(ctxt->c_contig_type == CONTIG_NONE); if (ctxt->c_split_covers_rec) { delete_tail_recs++; if (ctxt->c_contig_type == CONTIG_LEFTRIGHT || ctxt->c_has_empty_extent) delete_tail_recs++; if (ctxt->c_has_empty_extent) { if (ctxt->c_split_covers_rec && ctxt->c_has_empty_extent) { /* * The merge code will need to create an empty * extent to take the place of the newly Loading @@ -2837,7 +2830,6 @@ static int ocfs2_try_to_merge_extent(struct inode *inode, split_index--; rec = &el->l_recs[split_index]; } } if (ctxt->c_contig_type == CONTIG_LEFTRIGHT) { /* Loading Loading
fs/ocfs2/alloc.c +16 −24 Original line number Diff line number Diff line Loading @@ -2807,20 +2807,13 @@ static int ocfs2_try_to_merge_extent(struct inode *inode, struct ocfs2_merge_ctxt *ctxt) { int ret = 0, delete_tail_recs = 0; int ret = 0; struct ocfs2_extent_list *el = path_leaf_el(left_path); struct ocfs2_extent_rec *rec = &el->l_recs[split_index]; BUG_ON(ctxt->c_contig_type == CONTIG_NONE); if (ctxt->c_split_covers_rec) { delete_tail_recs++; if (ctxt->c_contig_type == CONTIG_LEFTRIGHT || ctxt->c_has_empty_extent) delete_tail_recs++; if (ctxt->c_has_empty_extent) { if (ctxt->c_split_covers_rec && ctxt->c_has_empty_extent) { /* * The merge code will need to create an empty * extent to take the place of the newly Loading @@ -2837,7 +2830,6 @@ static int ocfs2_try_to_merge_extent(struct inode *inode, split_index--; rec = &el->l_recs[split_index]; } } if (ctxt->c_contig_type == CONTIG_LEFTRIGHT) { /* Loading