Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6a7a665d authored by Liu Bo's avatar Liu Bo Committed by Josef Bacik
Browse files

Btrfs: reorder tree mod log operations in deleting a pointer 



Since we don't use MOD_LOG_KEY_REMOVE_WHILE_MOVING to add nritems
during rewinding, we should insert a MOD_LOG_KEY_REMOVE operation first.

Signed-off-by: default avatarLiu Bo <bo.li.liu@oracle.com>
Signed-off-by: default avatarChris Mason <chris.mason@fusionio.com>
parent 95c80bb1

fs/btrfs/ctree.c

+6 −4
Original line number Original line Diff line number Diff line
@@ -4609,6 +4609,12 @@ static void del_ptr(struct btrfs_trans_handle *trans, struct btrfs_root *root, 
	u32 nritems;

	u32 nritems;

	int ret;

	int ret;





	if (tree_mod_log && 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);

	nritems = btrfs_header_nritems(parent);

	if (slot != nritems - 1) {

	if (slot != nritems - 1) {

		if (tree_mod_log && level)

		if (tree_mod_log && level)
@@ -4619,10 +4625,6 @@ static void del_ptr(struct btrfs_trans_handle *trans, struct btrfs_root *root, 
			      btrfs_node_key_ptr_offset(slot + 1),

			      btrfs_node_key_ptr_offset(slot + 1),

			      sizeof(struct btrfs_key_ptr) *

			      sizeof(struct btrfs_key_ptr) *

			      (nritems - slot - 1));

			      (nritems - slot - 1));

	} else if (tree_mod_log && level) {

		ret = tree_mod_log_insert_key(root->fs_info, parent, slot,

					      MOD_LOG_KEY_REMOVE);

		BUG_ON(ret < 0);

	}

	}





	nritems--;

	nritems--;