aboutsummaryrefslogtreecommitdiffstats
path: root/fs/reiserfs/fix_node.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/reiserfs/fix_node.c')
-rw-r--r--fs/reiserfs/fix_node.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/reiserfs/fix_node.c b/fs/reiserfs/fix_node.c
index 33bbcb68b662..46b014623fd6 100644
--- a/fs/reiserfs/fix_node.c
+++ b/fs/reiserfs/fix_node.c
@@ -81,7 +81,7 @@ static void create_virtual_node(struct tree_balance *tb, int h)
81 ih = item_head(Sh, 0); 81 ih = item_head(Sh, 0);
82 82
83 /* define the mergeability for 0-th item (if it is not being deleted) */ 83 /* define the mergeability for 0-th item (if it is not being deleted) */
84 if (op_is_left_mergeable(&(ih->ih_key), Sh->b_size) 84 if (op_is_left_mergeable(&ih->ih_key, Sh->b_size)
85 && (vn->vn_mode != M_DELETE || vn->vn_affected_item_num)) 85 && (vn->vn_mode != M_DELETE || vn->vn_affected_item_num))
86 vn->vn_vi[0].vi_type |= VI_TYPE_LEFT_MERGEABLE; 86 vn->vn_vi[0].vi_type |= VI_TYPE_LEFT_MERGEABLE;
87 87
@@ -682,7 +682,7 @@ static int is_leaf_removable(struct tree_balance *tb)
682 /* check whether we can divide 1 remaining item between neighbors */ 682 /* check whether we can divide 1 remaining item between neighbors */
683 683
684 /* get size of remaining item (in item units) */ 684 /* get size of remaining item (in item units) */
685 size = op_unit_num(&(vn->vn_vi[to_left])); 685 size = op_unit_num(&vn->vn_vi[to_left]);
686 686
687 if (tb->lbytes + tb->rbytes >= size) { 687 if (tb->lbytes + tb->rbytes >= size) {
688 set_parameters(tb, 0, to_left + 1, to_right + 1, 0, NULL, 688 set_parameters(tb, 0, to_left + 1, to_right + 1, 0, NULL,
@@ -720,7 +720,7 @@ static int are_leaves_removable(struct tree_balance *tb, int lfree, int rfree)
720 720
721 ih = item_head(S0, 0); 721 ih = item_head(S0, 0);
722 if (tb->CFR[0] 722 if (tb->CFR[0]
723 && !comp_short_le_keys(&(ih->ih_key), 723 && !comp_short_le_keys(&ih->ih_key,
724 internal_key(tb->CFR[0], 724 internal_key(tb->CFR[0],
725 tb->rkey[0]))) 725 tb->rkey[0])))
726 /* 726 /*
@@ -1287,7 +1287,7 @@ static inline int can_node_be_removed(int mode, int lfree, int sfree, int rfree,
1287 /* shifting may merge items which might save space */ 1287 /* shifting may merge items which might save space */
1288 - 1288 -
1289 ((!h 1289 ((!h
1290 && op_is_left_mergeable(&(ih->ih_key), Sh->b_size)) ? IH_SIZE : 0) 1290 && op_is_left_mergeable(&ih->ih_key, Sh->b_size)) ? IH_SIZE : 0)
1291 - 1291 -
1292 ((!h && r_key 1292 ((!h && r_key
1293 && op_is_left_mergeable(r_key, Sh->b_size)) ? IH_SIZE : 0) 1293 && op_is_left_mergeable(r_key, Sh->b_size)) ? IH_SIZE : 0)