|
@@ -3929,14 +3929,17 @@ static noinline int push_for_double_split(struct btrfs_trans_handle *trans,
|
|
|
int progress = 0;
|
|
|
int slot;
|
|
|
u32 nritems;
|
|
|
+ int space_needed = data_size;
|
|
|
|
|
|
slot = path->slots[0];
|
|
|
+ if (slot < btrfs_header_nritems(path->nodes[0]))
|
|
|
+ space_needed -= btrfs_leaf_free_space(root, path->nodes[0]);
|
|
|
|
|
|
/*
|
|
|
* try to push all the items after our slot into the
|
|
|
* right leaf
|
|
|
*/
|
|
|
- ret = push_leaf_right(trans, root, path, 1, data_size, 0, slot);
|
|
|
+ ret = push_leaf_right(trans, root, path, 1, space_needed, 0, slot);
|
|
|
if (ret < 0)
|
|
|
return ret;
|
|
|
|
|
@@ -3956,7 +3959,7 @@ static noinline int push_for_double_split(struct btrfs_trans_handle *trans,
|
|
|
|
|
|
/* try to push all the items before our slot into the next leaf */
|
|
|
slot = path->slots[0];
|
|
|
- ret = push_leaf_left(trans, root, path, 1, data_size, 0, slot);
|
|
|
+ ret = push_leaf_left(trans, root, path, 1, space_needed, 0, slot);
|
|
|
if (ret < 0)
|
|
|
return ret;
|
|
|
|
|
@@ -4000,13 +4003,18 @@ static noinline int split_leaf(struct btrfs_trans_handle *trans,
|
|
|
|
|
|
/* first try to make some room by pushing left and right */
|
|
|
if (data_size && path->nodes[1]) {
|
|
|
- wret = push_leaf_right(trans, root, path, data_size,
|
|
|
- data_size, 0, 0);
|
|
|
+ int space_needed = data_size;
|
|
|
+
|
|
|
+ if (slot < btrfs_header_nritems(l))
|
|
|
+ space_needed -= btrfs_leaf_free_space(root, l);
|
|
|
+
|
|
|
+ wret = push_leaf_right(trans, root, path, space_needed,
|
|
|
+ space_needed, 0, 0);
|
|
|
if (wret < 0)
|
|
|
return wret;
|
|
|
if (wret) {
|
|
|
- wret = push_leaf_left(trans, root, path, data_size,
|
|
|
- data_size, 0, (u32)-1);
|
|
|
+ wret = push_leaf_left(trans, root, path, space_needed,
|
|
|
+ space_needed, 0, (u32)-1);
|
|
|
if (wret < 0)
|
|
|
return wret;
|
|
|
}
|