reiserfs: balance_leaf refactor, format balance_leaf_insert_right

Reformat balance_leaf_insert_right to adhere to CodingStyle.

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

1 files changed, 65 insertions, 52 deletions

diff --git a/fs/reiserfs/do_balan.c b/fs/reiserfs/do_balan.c
index 843c4023ad36..fcebfca0bbb8 100644
--- a/fs/reiserfs/do_balan.c
+++ b/fs/reiserfs/do_balan.c
@@ -626,71 +626,84 @@ static void balance_leaf_insert_right(struct tree_balance *tb,
         struct buffer_head *tbS0 = PATH_PLAST_BUFFER(tb->tb_path);
         int n = B_NR_ITEMS(tbS0);
         struct buffer_info bi;
-        int ret_val;
-                        if (n - tb->rnum[0] < tb->item_pos) {   /* new item or its part falls to R[0] */
-                                if (tb->item_pos == n - tb->rnum[0] + 1 && tb->rbytes != -1) {  /* part of new item falls into R[0] */
-                                        loff_t old_key_comp, old_len, r_zeroes_number;
-                                        const char *r_body;
-                                        int version;
-                                        loff_t offset;
+        int ret;
 
-                                        leaf_shift_right(tb, tb->rnum[0] - 1, -1);
+        /* new item or part of it doesn't fall into R[0] */
+        if (n - tb->rnum[0] >= tb->item_pos) {
+                leaf_shift_right(tb, tb->rnum[0], tb->rbytes);
+                return;
+        }
 
-                                        version = ih_version(ih);
-                                        /* Remember key component and item length */
-                                        old_key_comp = le_ih_k_offset(ih);
-                                        old_len = ih_item_len(ih);
+        /* new item or its part falls to R[0] */
 
-                                        /* Calculate key component and item length to insert into R[0] */
-                                        offset = le_ih_k_offset(ih) + ((old_len - tb->rbytes) << (is_indirect_le_ih(ih) ? tb->tb_sb->s_blocksize_bits - UNFM_P_SHIFT : 0));
-                                        set_le_ih_k_offset(ih, offset);
-                                        put_ih_item_len(ih, tb->rbytes);
-                                        /* Insert part of the item into R[0] */
-                                        buffer_info_init_right(tb, &bi);
-                                        if ((old_len - tb->rbytes) > tb->zeroes_num) {
-                                                r_zeroes_number = 0;
-                                                r_body = body + (old_len - tb->rbytes) - tb->zeroes_num;
-                                        } else {
-                                                r_body = body;
-                                                r_zeroes_number = tb->zeroes_num - (old_len - tb->rbytes);
-                                                tb->zeroes_num -= r_zeroes_number;
-                                        }
+        /* part of new item falls into R[0] */
+        if (tb->item_pos == n - tb->rnum[0] + 1 && tb->rbytes != -1) {
+                loff_t old_key_comp, old_len, r_zeroes_number;
+                const char *r_body;
+                int version, shift;
+                loff_t offset;
+
+                leaf_shift_right(tb, tb->rnum[0] - 1, -1);
 
-                                        leaf_insert_into_buf(&bi, 0, ih, r_body,
-                                                             r_zeroes_number);
+                version = ih_version(ih);
 
-                                        /* Replace right delimiting key by first key in R[0] */
-                                        replace_key(tb, tb->CFR[0], tb->rkey[0],
-                                                    tb->R[0], 0);
+                /* Remember key component and item length */
+                old_key_comp = le_ih_k_offset(ih);
+                old_len = ih_item_len(ih);
 
-                                        /* Calculate key component and item length to insert into S[0] */
-                                        set_le_ih_k_offset(ih, old_key_comp);
-                                        put_ih_item_len(ih, old_len - tb->rbytes);
+                /*
+                 * Calculate key component and item length to insert
+                 * into R[0]
+                 */
+                shift = 0;
+                if (is_indirect_le_ih(ih))
+                        shift = tb->tb_sb->s_blocksize_bits - UNFM_P_SHIFT;
+                offset = le_ih_k_offset(ih) + ((old_len - tb->rbytes) << shift);
+                set_le_ih_k_offset(ih, offset);
+                put_ih_item_len(ih, tb->rbytes);
+
+                /* Insert part of the item into R[0] */
+                buffer_info_init_right(tb, &bi);
+                if ((old_len - tb->rbytes) > tb->zeroes_num) {
+                        r_zeroes_number = 0;
+                        r_body = body + (old_len - tb->rbytes) - tb->zeroes_num;
+                } else {
+                        r_body = body;
+                        r_zeroes_number = tb->zeroes_num -
+                                          (old_len - tb->rbytes);
+                        tb->zeroes_num -= r_zeroes_number;
+                }
 
-                                        tb->insert_size[0] -= tb->rbytes;
+                leaf_insert_into_buf(&bi, 0, ih, r_body, r_zeroes_number);
 
-                                } else {        /* whole new item falls into R[0] */
+                /* Replace right delimiting key by first key in R[0] */
+                replace_key(tb, tb->CFR[0], tb->rkey[0], tb->R[0], 0);
 
-                                        /* Shift rnum[0]-1 items to R[0] */
-                                        ret_val = leaf_shift_right(tb, tb->rnum[0] - 1, tb->rbytes);
-                                        /* Insert new item into R[0] */
-                                        buffer_info_init_right(tb, &bi);
-                                        leaf_insert_into_buf(&bi, tb->item_pos - n + tb->rnum[0] - 1,
-                                                             ih, body, tb->zeroes_num);
+                /*
+                 * Calculate key component and item length to
+                 * insert into S[0]
+                 */
+                set_le_ih_k_offset(ih, old_key_comp);
+                put_ih_item_len(ih, old_len - tb->rbytes);
 
-                                        if (tb->item_pos - n + tb->rnum[0] - 1 == 0) {
-                                                replace_key(tb, tb->CFR[0],
-                                                            tb->rkey[0],
-                                                            tb->R[0], 0);
+                tb->insert_size[0] -= tb->rbytes;
 
-                                        }
-                                        tb->zeroes_num = tb->insert_size[0] = 0;
-                                }
-                        } else {        /* new item or part of it doesn't fall into R[0] */
+        } else {
+                /* whole new item falls into R[0] */
 
-                                leaf_shift_right(tb, tb->rnum[0], tb->rbytes);
-                        }
+                /* Shift rnum[0]-1 items to R[0] */
+                ret = leaf_shift_right(tb, tb->rnum[0] - 1, tb->rbytes);
+
+                /* Insert new item into R[0] */
+                buffer_info_init_right(tb, &bi);
+                leaf_insert_into_buf(&bi, tb->item_pos - n + tb->rnum[0] - 1,
+                                     ih, body, tb->zeroes_num);
 
+                if (tb->item_pos - n + tb->rnum[0] - 1 == 0)
+                        replace_key(tb, tb->CFR[0], tb->rkey[0], tb->R[0], 0);
+
+                tb->zeroes_num = tb->insert_size[0] = 0;
+        }
 }
 
 static void balance_leaf_paste_right(struct tree_balance *tb,