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

Commit 1ca22254 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs 

Pull two btrfs reverts from Chris Mason:
 "I had missed that for two of the patches in my last pull, we had
  included different fixes during 3.7."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  Revert "Btrfs: reorder tree mod log operations in deleting a pointer"
  Revert "Btrfs: MOD_LOG_KEY_REMOVE_WHILE_MOVING never change node's nritems"
parents a13eea6b 57ba86c0

fs/btrfs/ctree.c

+6 −8
Original line number Diff line number Diff line
@@ -1138,13 +1138,13 @@ __tree_mod_log_rewind(struct extent_buffer *eb, u64 time_seq, 
		switch (tm->op) {

		case MOD_LOG_KEY_REMOVE_WHILE_FREEING:

			BUG_ON(tm->slot < n);

		case MOD_LOG_KEY_REMOVE:

			n++;

		case MOD_LOG_KEY_REMOVE_WHILE_MOVING:

		case MOD_LOG_KEY_REMOVE:

			btrfs_set_node_key(eb, &tm->key, tm->slot);

			btrfs_set_node_blockptr(eb, tm->slot, tm->blockptr);

			btrfs_set_node_ptr_generation(eb, tm->slot,

						      tm->generation);

			n++;

			break;

		case MOD_LOG_KEY_REPLACE:

			BUG_ON(tm->slot >= n);
@@ -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--;