Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c480ea1 authored by Jeff Mahoney's avatar Jeff Mahoney Committed by Jan Kara
Browse files

reiserfs: balance_leaf refactor pull out balance_leaf_finish_node_insert 



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: default avatarJeff Mahoney <jeffm@suse.com>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent 9d496552

fs/reiserfs/do_balan.c

+21 −9
Original line number Diff line number Diff line
@@ -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
@@ -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] */