|
@@ -2997,7 +2997,7 @@ static noinline int insert_new_root(struct btrfs_trans_handle *trans,
|
|
|
static void insert_ptr(struct btrfs_trans_handle *trans,
|
|
|
struct btrfs_root *root, struct btrfs_path *path,
|
|
|
struct btrfs_disk_key *key, u64 bytenr,
|
|
|
- int slot, int level, int tree_mod_log)
|
|
|
+ int slot, int level)
|
|
|
{
|
|
|
struct extent_buffer *lower;
|
|
|
int nritems;
|
|
@@ -3010,7 +3010,7 @@ static void insert_ptr(struct btrfs_trans_handle *trans,
|
|
|
BUG_ON(slot > nritems);
|
|
|
BUG_ON(nritems == BTRFS_NODEPTRS_PER_BLOCK(root));
|
|
|
if (slot != nritems) {
|
|
|
- if (tree_mod_log && level)
|
|
|
+ if (level)
|
|
|
tree_mod_log_eb_move(root->fs_info, lower, slot + 1,
|
|
|
slot, nritems - slot);
|
|
|
memmove_extent_buffer(lower,
|
|
@@ -3018,7 +3018,7 @@ static void insert_ptr(struct btrfs_trans_handle *trans,
|
|
|
btrfs_node_key_ptr_offset(slot),
|
|
|
(nritems - slot) * sizeof(struct btrfs_key_ptr));
|
|
|
}
|
|
|
- if (tree_mod_log && level) {
|
|
|
+ if (level) {
|
|
|
ret = tree_mod_log_insert_key(root->fs_info, lower, slot,
|
|
|
MOD_LOG_KEY_ADD);
|
|
|
BUG_ON(ret < 0);
|
|
@@ -3106,7 +3106,7 @@ static noinline int split_node(struct btrfs_trans_handle *trans,
|
|
|
btrfs_mark_buffer_dirty(split);
|
|
|
|
|
|
insert_ptr(trans, root, path, &disk_key, split->start,
|
|
|
- path->slots[level + 1] + 1, level + 1, 1);
|
|
|
+ path->slots[level + 1] + 1, level + 1);
|
|
|
|
|
|
if (path->slots[level] >= mid) {
|
|
|
path->slots[level] -= mid;
|
|
@@ -3643,7 +3643,7 @@ static noinline void copy_for_split(struct btrfs_trans_handle *trans,
|
|
|
btrfs_set_header_nritems(l, mid);
|
|
|
btrfs_item_key(right, &disk_key, 0);
|
|
|
insert_ptr(trans, root, path, &disk_key, right->start,
|
|
|
- path->slots[1] + 1, 1, 0);
|
|
|
+ path->slots[1] + 1, 1);
|
|
|
|
|
|
btrfs_mark_buffer_dirty(right);
|
|
|
btrfs_mark_buffer_dirty(l);
|
|
@@ -3850,7 +3850,7 @@ again:
|
|
|
if (mid <= slot) {
|
|
|
btrfs_set_header_nritems(right, 0);
|
|
|
insert_ptr(trans, root, path, &disk_key, right->start,
|
|
|
- path->slots[1] + 1, 1, 0);
|
|
|
+ path->slots[1] + 1, 1);
|
|
|
btrfs_tree_unlock(path->nodes[0]);
|
|
|
free_extent_buffer(path->nodes[0]);
|
|
|
path->nodes[0] = right;
|
|
@@ -3859,7 +3859,7 @@ again:
|
|
|
} else {
|
|
|
btrfs_set_header_nritems(right, 0);
|
|
|
insert_ptr(trans, root, path, &disk_key, right->start,
|
|
|
- path->slots[1], 1, 0);
|
|
|
+ path->slots[1], 1);
|
|
|
btrfs_tree_unlock(path->nodes[0]);
|
|
|
free_extent_buffer(path->nodes[0]);
|
|
|
path->nodes[0] = right;
|