Skip to content

Commit

Permalink
reiserfs: balance_leaf refactor pull out balance_leaf_finish_node_insert
Browse files Browse the repository at this point in the history
This patch factors out a new balance_leaf_finish_node_insert from the code
in balance_leaf responsible for inserting new items into S[0]

It has not been reformatted yet.

Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: Jan Kara <jack@suse.cz>
  • Loading branch information
Jeff Mahoney authored and Jan Kara committed May 7, 2014
1 parent 9d49655 commit 8c480ea
Showing 1 changed file with 21 additions and 9 deletions.
30 changes: 21 additions & 9 deletions fs/reiserfs/do_balan.c
Original file line number Diff line number Diff line change
Expand Up @@ -962,6 +962,26 @@ static void balance_leaf_new_nodes_paste(struct tree_balance *tb,

}

static void balance_leaf_finish_node_insert(struct tree_balance *tb,
struct item_head *ih,
const char *body)
{
struct buffer_head *tbS0 = PATH_PLAST_BUFFER(tb->tb_path);
struct buffer_info bi;
buffer_info_init_tbS0(tb, &bi);
leaf_insert_into_buf(&bi, tb->item_pos, ih,
body, tb->zeroes_num);

/*
* If we insert the first key
* change the delimiting key
*/
if (tb->item_pos == 0) {
if (tb->CFL[0]) /* can be 0 in reiserfsck */
replace_key(tb, tb->CFL[0], tb->lkey[0], tbS0, 0);
}
}

/**
* balance_leaf - reiserfs tree balancing algorithm
* @tb: tree balance state
Expand Down Expand Up @@ -1136,15 +1156,7 @@ static int balance_leaf(struct tree_balance *tb, struct item_head *ih,

switch (flag) {
case M_INSERT: /* insert item into S[0] */
buffer_info_init_tbS0(tb, &bi);
leaf_insert_into_buf(&bi, tb->item_pos, ih,
body, tb->zeroes_num);

/* If we insert the first key change the delimiting key */
if (tb->item_pos == 0) {
if (tb->CFL[0]) /* can be 0 in reiserfsck */
replace_key(tb, tb->CFL[0], tb->lkey[0], tbS0, 0);
}
balance_leaf_finish_node_insert(tb, ih, body);
break;

case M_PASTE:{ /* append item in S[0] */
Expand Down

0 comments on commit 8c480ea

Please sign in to comment.