Commit 92de551b authored by Josef Bacik's avatar Josef Bacik Committed by David Sterba
Browse files

btrfs: check record_root_in_trans related failures in select_reloc_root 



We will record the fs root or the reloc root in the trans in
select_reloc_root.  These will actually return errors in the following
patches, so check their return value here and return it up the stack.

Reviewed-by: default avatarQu Wenruo <wqu@suse.com>
Signed-off-by: default avatarJosef Bacik <josef@toxicpanda.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 8ee66afe

fs/btrfs/relocation.c

+7 −2
Original line number Diff line number Diff line
@@ -1988,6 +1988,7 @@ struct btrfs_root *select_reloc_root(struct btrfs_trans_handle *trans, 
	struct btrfs_backref_node *next;

	struct btrfs_root *root;

	int index = 0;

	int ret;



	next = node;

	while (1) {
@@ -2023,11 +2024,15 @@ struct btrfs_root *select_reloc_root(struct btrfs_trans_handle *trans, 
		}



		if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID) {

			record_reloc_root_in_trans(trans, root);

			ret = record_reloc_root_in_trans(trans, root);

			if (ret)

				return ERR_PTR(ret);

			break;

		}



		btrfs_record_root_in_trans(trans, root);

		ret = btrfs_record_root_in_trans(trans, root);

		if (ret)

			return ERR_PTR(ret);

		root = root->reloc_root;



		if (next->new_bytenr != root->node->start) {