Commit 57ba86c0 authored by Chris Mason's avatar Chris Mason
Browse files

Revert "Btrfs: reorder tree mod log operations in deleting a pointer" 



This reverts commit 6a7a665d.

This was bug was fixed differently in 3.6, so this commit
isn't needed.

Conflicts:
	fs/btrfs/ctree.c

Signed-off-by: default avatarChris Mason <chris.mason@fusionio.com>
parent 4c3e6969

fs/btrfs/ctree.c

+4 −6
Original line number Diff line number Diff line
@@ -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--;