fix src offset

Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com>

diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index 14d3f5ed23aff51a057231be9f1c7479bfa6f448..2eba5b01992ded802cab8b80cf09f48d90b422de 100644 (file)
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -3664,12 +3664,11 @@ static inline void mas_wr_converged(struct ma_node_info *src,
        mni_finalise(dst);
 }
 
-static int state_setup(struct ma_node_state *state, struct ma_node_info *src,
+static void state_setup(struct ma_node_state *state, struct ma_node_info *src,
                struct ma_node_info *dst, struct ma_node_part *part,
                struct split_data *sd)
 {
                unsigned char copied;
-               unsigned char inc_off;
 
                /* Configure one state */
                state = &sd->states[sd->len];
@@ -3680,7 +3679,7 @@ static int state_setup(struct ma_node_state *state, struct ma_node_info *src,
                        mns_mni_init(state, dst, part->pos , copied);
                        state->use_part = true;
                        part->pos += copied;
-                       inc_off = sd->src_ins_end + 1;
+                       src->offset = sd->src_ins_end + 1;
                } else {
                        state->info = src;
                        if (sd->offset < sd->insert_end) {
@@ -3694,14 +3693,12 @@ static int state_setup(struct ma_node_state *state, struct ma_node_info *src,
                        }
                        BUG_ON(copied == 0);
                        mns_mni_init(state, dst, src->offset, copied);
-                       inc_off = copied;
+                       src->offset += copied;
                }
 
                sd->offset += copied;
-               src->offset += copied;
                sd->space -= copied;
                printk("offset %u split %u\n", sd->offset, sd->split);
-               return inc_off;
 }
 
 /*