aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ocfs2/alloc.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/ocfs2/alloc.c')
-rw-r--r--fs/ocfs2/alloc.c13
1 files changed, 3 insertions, 10 deletions
diff --git a/fs/ocfs2/alloc.c b/fs/ocfs2/alloc.c
index c078b3b1f01e..c91706f949ff 100644
--- a/fs/ocfs2/alloc.c
+++ b/fs/ocfs2/alloc.c
@@ -361,7 +361,6 @@ struct ocfs2_merge_ctxt {
361 enum ocfs2_contig_type c_contig_type; 361 enum ocfs2_contig_type c_contig_type;
362 int c_has_empty_extent; 362 int c_has_empty_extent;
363 int c_split_covers_rec; 363 int c_split_covers_rec;
364 int c_used_tail_recs;
365}; 364};
366 365
367/* 366/*
@@ -3999,11 +3998,6 @@ static int __ocfs2_mark_extent_written(struct inode *inode,
3999 } else 3998 } else
4000 rightmost_el = path_root_el(path); 3999 rightmost_el = path_root_el(path);
4001 4000
4002 ctxt.c_used_tail_recs = le16_to_cpu(rightmost_el->l_next_free_rec);
4003 if (ctxt.c_used_tail_recs > 0 &&
4004 ocfs2_is_empty_extent(&rightmost_el->l_recs[0]))
4005 ctxt.c_used_tail_recs--;
4006
4007 if (rec->e_cpos == split_rec->e_cpos && 4001 if (rec->e_cpos == split_rec->e_cpos &&
4008 rec->e_leaf_clusters == split_rec->e_leaf_clusters) 4002 rec->e_leaf_clusters == split_rec->e_leaf_clusters)
4009 ctxt.c_split_covers_rec = 1; 4003 ctxt.c_split_covers_rec = 1;
@@ -4012,10 +4006,9 @@ static int __ocfs2_mark_extent_written(struct inode *inode,
4012 4006
4013 ctxt.c_has_empty_extent = ocfs2_is_empty_extent(&el->l_recs[0]); 4007 ctxt.c_has_empty_extent = ocfs2_is_empty_extent(&el->l_recs[0]);
4014 4008
4015 mlog(0, "index: %d, contig: %u, used_tail_recs: %u, " 4009 mlog(0, "index: %d, contig: %u, has_empty: %u, split_covers: %u\n",
4016 "has_empty: %u, split_covers: %u\n", split_index, 4010 split_index, ctxt.c_contig_type, ctxt.c_has_empty_extent,
4017 ctxt.c_contig_type, ctxt.c_used_tail_recs, 4011 ctxt.c_split_covers_rec);
4018 ctxt.c_has_empty_extent, ctxt.c_split_covers_rec);
4019 4012
4020 if (ctxt.c_contig_type == CONTIG_NONE) { 4013 if (ctxt.c_contig_type == CONTIG_NONE) {
4021 if (ctxt.c_split_covers_rec) 4014 if (ctxt.c_split_covers_rec)