diff options
| author | Chris Mason <chris.mason@fusionio.com> | 2012-12-19 01:35:32 +0100 |
|---|---|---|
| committer | Chris Mason <chris.mason@fusionio.com> | 2012-12-19 01:35:32 +0100 |
| commit | 57ba86c00f9573b63b8c06810d4f6915efed2442 (patch) | |
| tree | e1b289782b73bf83503d5e5eb8089411773e13fe /fs/btrfs | |
| parent | Revert "Btrfs: MOD_LOG_KEY_REMOVE_WHILE_MOVING never change node's nritems" (diff) | |
| download | linux-57ba86c00f9573b63b8c06810d4f6915efed2442.tar.xz linux-57ba86c00f9573b63b8c06810d4f6915efed2442.zip | |
Revert "Btrfs: reorder tree mod log operations in deleting a pointer"
This reverts commit 6a7a665d78c5dd8bc76a010648c4e7d84517ab5a.
This was bug was fixed differently in 3.6, so this commit
isn't needed.
Conflicts:
fs/btrfs/ctree.c
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
Diffstat (limited to 'fs/btrfs')
| -rw-r--r-- | fs/btrfs/ctree.c | 10 |
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, u32 nritems; int ret; - if (level) { - ret = tree_mod_log_insert_key(root->fs_info, parent, slot, - MOD_LOG_KEY_REMOVE); - BUG_ON(ret < 0); - } - nritems = btrfs_header_nritems(parent); if (slot != nritems - 1) { if (level) @@ -4627,6 +4621,10 @@ static void del_ptr(struct btrfs_trans_handle *trans, struct btrfs_root *root, btrfs_node_key_ptr_offset(slot + 1), sizeof(struct btrfs_key_ptr) * (nritems - slot - 1)); + } else if (level) { + ret = tree_mod_log_insert_key(root->fs_info, parent, slot, + MOD_LOG_KEY_REMOVE); + BUG_ON(ret < 0); } nritems--; |