reiserfs: balance_leaf refactor, pull out balance_leaf_paste_right

This patch factors out a new balance_leaf_paste_right from the code in
balance_leaf responsible for pasting new contents into an existing item
located in the node to the right of S[0] in the tree.

It has not been reformatted yet.

Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: Jan Kara <jack@suse.cz>

1 files changed, 90 insertions, 80 deletions

diff --git a/fs/reiserfs/do_balan.c b/fs/reiserfs/do_balan.c
index fc15e676a651..4dbe0a34739f 100644
--- a/fs/reiserfs/do_balan.c
+++ b/fs/reiserfs/do_balan.c
@@ -582,91 +582,14 @@ static void balance_leaf_insert_right(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,
-                        struct item_head *insert_key,
-                        struct buffer_head **insert_ptr)
+static void balance_leaf_paste_right(struct tree_balance *tb,
+                                     struct item_head *ih, const char *body)
 {
         struct buffer_head *tbS0 = PATH_PLAST_BUFFER(tb->tb_path);
+        int n = B_NR_ITEMS(tbS0);
         struct buffer_info bi;
-        int n, i;
         int ret_val;
 
-        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 */
-
                         if (n - tb->rnum[0] <= tb->item_pos) {  /* pasted item or part of it falls to R[0] */
                                 if (tb->item_pos == n - tb->rnum[0] && tb->rbytes != -1) {      /* we must shift the part of the appended item */
                                         if (is_direntry_le_ih(item_head(tbS0, tb->item_pos))) { /* we append to directory item */
@@ -807,6 +730,93 @@ static int balance_leaf(struct tree_balance *tb, struct item_head *ih,
 
                                 leaf_shift_right(tb, tb->rnum[0], tb->rbytes);
                         }
+
+}
+
+/**
+ * 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",