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

Commit 9d496552 authored by Jeff Mahoney's avatar Jeff Mahoney Committed by Jan Kara
Browse files

reiserfs: balance_leaf refactor, pull out balance_leaf_new_nodes_paste 



This patch factors out a new balance_leaf_new_nodes_insert from the code
in balance_leaf responsible for pasting new content into existing items
that may have been shifted into new nodes in the tree.

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 65ab18cb

fs/reiserfs/do_balan.c

+160 −146
Original line number Diff line number Diff line
@@ -804,156 +804,16 @@ static void balance_leaf_new_nodes_insert(struct tree_balance *tb, 
			}

}



/**

 * balance_leaf - reiserfs tree balancing algorithm

 * @tb: tree balance state

 * @ih: item header of inserted item (little endian)

 * @body: body of inserted item or bytes to paste

 * @flag: i - insert, d - delete, c - cut, p - paste (see do_balance)

 * passed back:

 * @insert_key: key to insert new nodes

 * @insert_ptr: array of nodes to insert at the next level

 *

 * In our processing of one level we sometimes determine what must be

 * inserted into the next higher level.  This insertion consists of a

 * key or two keys and their corresponding pointers.

 */

static int balance_leaf(struct tree_balance *tb, struct item_head *ih,

			const char *body, int flag,

static void balance_leaf_new_nodes_paste(struct tree_balance *tb,

					 struct item_head *ih,

					 const char *body,

					 struct item_head *insert_key,

			struct buffer_head **insert_ptr)

					 struct buffer_head **insert_ptr,

					 int i)

{

	struct buffer_head *tbS0 = PATH_PLAST_BUFFER(tb->tb_path);

	int n = B_NR_ITEMS(tbS0);

	struct buffer_info bi;

	int n, i;



	PROC_INFO_INC(tb->tb_sb, balance_at[0]);



	/* Make balance in case insert_size[0] < 0 */

	if (tb->insert_size[0] < 0)

		return balance_leaf_when_delete(tb, flag);



	tb->item_pos = PATH_LAST_POSITION(tb->tb_path),

	tb->pos_in_item = tb->tb_path->pos_in_item,

	tb->zeroes_num = 0;

	if (flag == M_INSERT && !body)

		tb->zeroes_num = ih_item_len(ih);



	/*

	 * for indirect item pos_in_item is measured in unformatted node

	 * pointers. Recalculate to bytes

	 */

	if (flag != M_INSERT

	    && is_indirect_le_ih(item_head(tbS0, tb->item_pos)))

		tb->pos_in_item *= UNFM_P_SIZE;



	if (tb->lnum[0] > 0) {

		/* Shift lnum[0] items from S[0] to the left neighbor L[0] */

		if (tb->item_pos < tb->lnum[0]) {

			/* new item or it part falls to L[0], shift it too */

			n = B_NR_ITEMS(tb->L[0]);



			switch (flag) {

			case M_INSERT:	/* insert item into L[0] */

				balance_leaf_insert_left(tb, ih, body);

				break;



			case M_PASTE:	/* append item in L[0] */

				balance_leaf_paste_left(tb, ih, body);

				break;

			default:	/* cases d and t */

				reiserfs_panic(tb->tb_sb, "PAP-12130",

					       "lnum > 0: unexpected mode: "

					       " %s(%d)",

					       (flag == M_DELETE) ? "DELETE" : ((flag == M_CUT) ? "CUT" : "UNKNOWN"), flag);

			}

		} else {

			/* new item doesn't fall into L[0] */

			leaf_shift_left(tb, tb->lnum[0], tb->lbytes);

		}

	}



	/* tb->lnum[0] > 0 */

	/* Calculate new item position */

	tb->item_pos -= (tb->lnum[0] - ((tb->lbytes != -1) ? 1 : 0));



	if (tb->rnum[0] > 0) {

		/* shift rnum[0] items from S[0] to the right neighbor R[0] */

		n = B_NR_ITEMS(tbS0);

		switch (flag) {



		case M_INSERT:	/* insert item */

			balance_leaf_insert_right(tb, ih, body);

			break;



		case M_PASTE:	/* append item */

			balance_leaf_paste_right(tb, ih, body);

			break;

		default:	/* cases d and t */

			reiserfs_panic(tb->tb_sb, "PAP-12175",

				       "rnum > 0: unexpected mode: %s(%d)",

				       (flag == M_DELETE) ? "DELETE" : ((flag == M_CUT) ? "CUT" : "UNKNOWN"), flag);

		}



	}



	/* tb->rnum[0] > 0 */

	RFALSE(tb->blknum[0] > 3,

	       "PAP-12180: blknum can not be %d. It must be <= 3", tb->blknum[0]);

	RFALSE(tb->blknum[0] < 0,

	       "PAP-12185: blknum can not be %d. It must be >= 0", tb->blknum[0]);



	/*

	 * if while adding to a node we discover that it is possible to split

	 * it in two, and merge the left part into the left neighbor and the

	 * right part into the right neighbor, eliminating the node

	 */

	if (tb->blknum[0] == 0) {	/* node S[0] is empty now */



		RFALSE(!tb->lnum[0] || !tb->rnum[0],

		       "PAP-12190: lnum and rnum must not be zero");

		/*

		 * if insertion was done before 0-th position in R[0], right

		 * delimiting key of the tb->L[0]'s and left delimiting key are

		 * not set correctly

		 */

		if (tb->CFL[0]) {

			if (!tb->CFR[0])

				reiserfs_panic(tb->tb_sb, "vs-12195",

					       "CFR not initialized");

			copy_key(internal_key(tb->CFL[0], tb->lkey[0]),

				 internal_key(tb->CFR[0], tb->rkey[0]));

			do_balance_mark_internal_dirty(tb, tb->CFL[0], 0);

		}



		reiserfs_invalidate_buffer(tb, tbS0);

		return 0;

	}



	/* Fill new nodes that appear in place of S[0] */

	for (i = tb->blknum[0] - 2; i >= 0; i--) {



		RFALSE(!tb->snum[i],

		       "PAP-12200: snum[%d] == %d. Must be > 0", i,

		       tb->snum[i]);



		/* here we shift from S to S_new nodes */



		tb->S_new[i] = get_FEB(tb);



		/* initialized block type and tree level */

		set_blkh_level(B_BLK_HEAD(tb->S_new[i]), DISK_LEAF_NODE_LEVEL);



		n = B_NR_ITEMS(tbS0);



		switch (flag) {

		case M_INSERT:	/* insert item */

			balance_leaf_new_nodes_insert(tb, ih, body, insert_key,

						      insert_ptr, i);

			break;



		case M_PASTE:	/* append item */



			if (n - tb->snum[i] <= tb->item_pos) {	/* pasted item or part if it falls to S_new[i] */

				if (tb->item_pos == n - tb->snum[i] && tb->sbytes[i] != -1) {	/* we must shift part of the appended item */

					struct item_head *aux_ih;
@@ -1099,6 +959,160 @@ static int balance_leaf(struct tree_balance *tb, struct item_head *ih, 
				leaf_move_items(LEAF_FROM_S_TO_SNEW, tb,

						tb->snum[i], tb->sbytes[i], tb->S_new[i]);

			}



}



/**

 * balance_leaf - reiserfs tree balancing algorithm

 * @tb: tree balance state

 * @ih: item header of inserted item (little endian)

 * @body: body of inserted item or bytes to paste

 * @flag: i - insert, d - delete, c - cut, p - paste (see do_balance)

 * passed back:

 * @insert_key: key to insert new nodes

 * @insert_ptr: array of nodes to insert at the next level

 *

 * In our processing of one level we sometimes determine what must be

 * inserted into the next higher level.  This insertion consists of a

 * key or two keys and their corresponding pointers.

 */

static int balance_leaf(struct tree_balance *tb, struct item_head *ih,

			const char *body, int flag,

			struct item_head *insert_key,

			struct buffer_head **insert_ptr)

{

	struct buffer_head *tbS0 = PATH_PLAST_BUFFER(tb->tb_path);

	struct buffer_info bi;

	int n, i;



	PROC_INFO_INC(tb->tb_sb, balance_at[0]);



	/* Make balance in case insert_size[0] < 0 */

	if (tb->insert_size[0] < 0)

		return balance_leaf_when_delete(tb, flag);



	tb->item_pos = PATH_LAST_POSITION(tb->tb_path),

	tb->pos_in_item = tb->tb_path->pos_in_item,

	tb->zeroes_num = 0;

	if (flag == M_INSERT && !body)

		tb->zeroes_num = ih_item_len(ih);



	/*

	 * for indirect item pos_in_item is measured in unformatted node

	 * pointers. Recalculate to bytes

	 */

	if (flag != M_INSERT

	    && is_indirect_le_ih(item_head(tbS0, tb->item_pos)))

		tb->pos_in_item *= UNFM_P_SIZE;



	if (tb->lnum[0] > 0) {

		/* Shift lnum[0] items from S[0] to the left neighbor L[0] */

		if (tb->item_pos < tb->lnum[0]) {

			/* new item or it part falls to L[0], shift it too */

			n = B_NR_ITEMS(tb->L[0]);



			switch (flag) {

			case M_INSERT:	/* insert item into L[0] */

				balance_leaf_insert_left(tb, ih, body);

				break;



			case M_PASTE:	/* append item in L[0] */

				balance_leaf_paste_left(tb, ih, body);

				break;

			default:	/* cases d and t */

				reiserfs_panic(tb->tb_sb, "PAP-12130",

					       "lnum > 0: unexpected mode: "

					       " %s(%d)",

					       (flag == M_DELETE) ? "DELETE" : ((flag == M_CUT) ? "CUT" : "UNKNOWN"), flag);

			}

		} else {

			/* new item doesn't fall into L[0] */

			leaf_shift_left(tb, tb->lnum[0], tb->lbytes);

		}

	}



	/* tb->lnum[0] > 0 */

	/* Calculate new item position */

	tb->item_pos -= (tb->lnum[0] - ((tb->lbytes != -1) ? 1 : 0));



	if (tb->rnum[0] > 0) {

		/* shift rnum[0] items from S[0] to the right neighbor R[0] */

		n = B_NR_ITEMS(tbS0);

		switch (flag) {



		case M_INSERT:	/* insert item */

			balance_leaf_insert_right(tb, ih, body);

			break;



		case M_PASTE:	/* append item */

			balance_leaf_paste_right(tb, ih, body);

			break;

		default:	/* cases d and t */

			reiserfs_panic(tb->tb_sb, "PAP-12175",

				       "rnum > 0: unexpected mode: %s(%d)",

				       (flag == M_DELETE) ? "DELETE" : ((flag == M_CUT) ? "CUT" : "UNKNOWN"), flag);

		}



	}



	/* tb->rnum[0] > 0 */

	RFALSE(tb->blknum[0] > 3,

	       "PAP-12180: blknum can not be %d. It must be <= 3", tb->blknum[0]);

	RFALSE(tb->blknum[0] < 0,

	       "PAP-12185: blknum can not be %d. It must be >= 0", tb->blknum[0]);



	/*

	 * if while adding to a node we discover that it is possible to split

	 * it in two, and merge the left part into the left neighbor and the

	 * right part into the right neighbor, eliminating the node

	 */

	if (tb->blknum[0] == 0) {	/* node S[0] is empty now */



		RFALSE(!tb->lnum[0] || !tb->rnum[0],

		       "PAP-12190: lnum and rnum must not be zero");

		/*

		 * if insertion was done before 0-th position in R[0], right

		 * delimiting key of the tb->L[0]'s and left delimiting key are

		 * not set correctly

		 */

		if (tb->CFL[0]) {

			if (!tb->CFR[0])

				reiserfs_panic(tb->tb_sb, "vs-12195",

					       "CFR not initialized");

			copy_key(internal_key(tb->CFL[0], tb->lkey[0]),

				 internal_key(tb->CFR[0], tb->rkey[0]));

			do_balance_mark_internal_dirty(tb, tb->CFL[0], 0);

		}



		reiserfs_invalidate_buffer(tb, tbS0);

		return 0;

	}



	/* Fill new nodes that appear in place of S[0] */

	for (i = tb->blknum[0] - 2; i >= 0; i--) {



		RFALSE(!tb->snum[i],

		       "PAP-12200: snum[%d] == %d. Must be > 0", i,

		       tb->snum[i]);



		/* here we shift from S to S_new nodes */



		tb->S_new[i] = get_FEB(tb);



		/* initialized block type and tree level */

		set_blkh_level(B_BLK_HEAD(tb->S_new[i]), DISK_LEAF_NODE_LEVEL);



		n = B_NR_ITEMS(tbS0);



		switch (flag) {

		case M_INSERT:	/* insert item */

			balance_leaf_new_nodes_insert(tb, ih, body, insert_key,

						      insert_ptr, i);

			break;



		case M_PASTE:	/* append item */

			balance_leaf_new_nodes_paste(tb, ih, body, insert_key,

						     insert_ptr, i);

			break;

		default:	/* cases d and t */

			reiserfs_panic(tb->tb_sb, "PAP-12245",