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

btrfs: handle record_root_in_trans failure in create_pending_snapshot 



record_root_in_trans can currently fail, so handle this failure
properly.

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 1409e6cc

fs/btrfs/transaction.c

+8 −3
Original line number Diff line number Diff line
@@ -1603,8 +1603,9 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans, 
	dentry = pending->dentry;

	parent_inode = pending->dir;

	parent_root = BTRFS_I(parent_inode)->root;

	record_root_in_trans(trans, parent_root, 0);



	ret = record_root_in_trans(trans, parent_root, 0);

	if (ret)

		goto fail;

	cur_time = current_time(parent_inode);



	/*
@@ -1640,7 +1641,11 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans, 
		goto fail;

	}



	record_root_in_trans(trans, root, 0);

	ret = record_root_in_trans(trans, root, 0);

	if (ret) {

		btrfs_abort_transaction(trans, ret);

		goto fail;

	}

	btrfs_set_root_last_snapshot(&root->root_item, trans->transid);

	memcpy(new_root_item, &root->root_item, sizeof(*new_root_item));

	btrfs_check_and_init_root_item(new_root_item);