aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs
diff options
context:
space:
mode:
Diffstat (limited to 'fs/btrfs')
-rw-r--r--fs/btrfs/ctree.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
index 569c0dfb526c..eea5da7a2b9a 100644
--- a/fs/btrfs/ctree.c
+++ b/fs/btrfs/ctree.c
@@ -4611,12 +4611,6 @@ static void del_ptr(struct btrfs_trans_handle *trans, struct btrfs_root *root,
4611 u32 nritems; 4611 u32 nritems;
4612 int ret; 4612 int ret;
4613 4613
4614 if (level) {
4615 ret = tree_mod_log_insert_key(root->fs_info, parent, slot,
4616 MOD_LOG_KEY_REMOVE);
4617 BUG_ON(ret < 0);
4618 }
4619
4620 nritems = btrfs_header_nritems(parent); 4614 nritems = btrfs_header_nritems(parent);
4621 if (slot != nritems - 1) { 4615 if (slot != nritems - 1) {
4622 if (level) 4616 if (level)
@@ -4627,6 +4621,10 @@ static void del_ptr(struct btrfs_trans_handle *trans, struct btrfs_root *root,
4627 btrfs_node_key_ptr_offset(slot + 1), 4621 btrfs_node_key_ptr_offset(slot + 1),
4628 sizeof(struct btrfs_key_ptr) * 4622 sizeof(struct btrfs_key_ptr) *
4629 (nritems - slot - 1)); 4623 (nritems - slot - 1));
4624 } else if (level) {
4625 ret = tree_mod_log_insert_key(root->fs_info, parent, slot,
4626 MOD_LOG_KEY_REMOVE);
4627 BUG_ON(ret < 0);
4630 } 4628 }
4631 4629
4632 nritems--; 4630 nritems--;