|
@@ -775,8 +775,7 @@ tree_mod_log_eb_move(struct btrfs_fs_info *fs_info, struct extent_buffer *dst,
|
|
|
|
|
|
static noinline void
|
|
static noinline void
|
|
tree_mod_log_set_node_key(struct btrfs_fs_info *fs_info,
|
|
tree_mod_log_set_node_key(struct btrfs_fs_info *fs_info,
|
|
- struct extent_buffer *eb,
|
|
|
|
- struct btrfs_disk_key *disk_key, int slot, int atomic)
|
|
|
|
|
|
+ struct extent_buffer *eb, int slot, int atomic)
|
|
{
|
|
{
|
|
int ret;
|
|
int ret;
|
|
|
|
|
|
@@ -1835,7 +1834,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans,
|
|
struct btrfs_disk_key right_key;
|
|
struct btrfs_disk_key right_key;
|
|
btrfs_node_key(right, &right_key, 0);
|
|
btrfs_node_key(right, &right_key, 0);
|
|
tree_mod_log_set_node_key(root->fs_info, parent,
|
|
tree_mod_log_set_node_key(root->fs_info, parent,
|
|
- &right_key, pslot + 1, 0);
|
|
|
|
|
|
+ pslot + 1, 0);
|
|
btrfs_set_node_key(parent, &right_key, pslot + 1);
|
|
btrfs_set_node_key(parent, &right_key, pslot + 1);
|
|
btrfs_mark_buffer_dirty(parent);
|
|
btrfs_mark_buffer_dirty(parent);
|
|
}
|
|
}
|
|
@@ -1879,7 +1878,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans,
|
|
/* update the parent key to reflect our changes */
|
|
/* update the parent key to reflect our changes */
|
|
struct btrfs_disk_key mid_key;
|
|
struct btrfs_disk_key mid_key;
|
|
btrfs_node_key(mid, &mid_key, 0);
|
|
btrfs_node_key(mid, &mid_key, 0);
|
|
- tree_mod_log_set_node_key(root->fs_info, parent, &mid_key,
|
|
|
|
|
|
+ tree_mod_log_set_node_key(root->fs_info, parent,
|
|
pslot, 0);
|
|
pslot, 0);
|
|
btrfs_set_node_key(parent, &mid_key, pslot);
|
|
btrfs_set_node_key(parent, &mid_key, pslot);
|
|
btrfs_mark_buffer_dirty(parent);
|
|
btrfs_mark_buffer_dirty(parent);
|
|
@@ -1979,7 +1978,7 @@ static noinline int push_nodes_for_insert(struct btrfs_trans_handle *trans,
|
|
orig_slot += left_nr;
|
|
orig_slot += left_nr;
|
|
btrfs_node_key(mid, &disk_key, 0);
|
|
btrfs_node_key(mid, &disk_key, 0);
|
|
tree_mod_log_set_node_key(root->fs_info, parent,
|
|
tree_mod_log_set_node_key(root->fs_info, parent,
|
|
- &disk_key, pslot, 0);
|
|
|
|
|
|
+ pslot, 0);
|
|
btrfs_set_node_key(parent, &disk_key, pslot);
|
|
btrfs_set_node_key(parent, &disk_key, pslot);
|
|
btrfs_mark_buffer_dirty(parent);
|
|
btrfs_mark_buffer_dirty(parent);
|
|
if (btrfs_header_nritems(left) > orig_slot) {
|
|
if (btrfs_header_nritems(left) > orig_slot) {
|
|
@@ -2032,7 +2031,7 @@ static noinline int push_nodes_for_insert(struct btrfs_trans_handle *trans,
|
|
|
|
|
|
btrfs_node_key(right, &disk_key, 0);
|
|
btrfs_node_key(right, &disk_key, 0);
|
|
tree_mod_log_set_node_key(root->fs_info, parent,
|
|
tree_mod_log_set_node_key(root->fs_info, parent,
|
|
- &disk_key, pslot + 1, 0);
|
|
|
|
|
|
+ pslot + 1, 0);
|
|
btrfs_set_node_key(parent, &disk_key, pslot + 1);
|
|
btrfs_set_node_key(parent, &disk_key, pslot + 1);
|
|
btrfs_mark_buffer_dirty(parent);
|
|
btrfs_mark_buffer_dirty(parent);
|
|
|
|
|
|
@@ -2916,7 +2915,7 @@ static void fixup_low_keys(struct btrfs_trans_handle *trans,
|
|
if (!path->nodes[i])
|
|
if (!path->nodes[i])
|
|
break;
|
|
break;
|
|
t = path->nodes[i];
|
|
t = path->nodes[i];
|
|
- tree_mod_log_set_node_key(root->fs_info, t, key, tslot, 1);
|
|
|
|
|
|
+ tree_mod_log_set_node_key(root->fs_info, t, tslot, 1);
|
|
btrfs_set_node_key(t, key, tslot);
|
|
btrfs_set_node_key(t, key, tslot);
|
|
btrfs_mark_buffer_dirty(path->nodes[i]);
|
|
btrfs_mark_buffer_dirty(path->nodes[i]);
|
|
if (tslot != 0)
|
|
if (tslot != 0)
|