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

Commit 41ce9970 authored by Wang Shilong's avatar Wang Shilong Committed by Chris Mason
Browse files

Btrfs: remove transaction from btrfs send 



Since daivd did the work that force us to use readonly snapshot,
we can safely remove transaction protection from btrfs send.

Signed-off-by: default avatarWang Shilong <wangsl.fnst@cn.fujitsu.com>
Signed-off-by: default avatarJosef Bacik <jbacik@fb.com>
Signed-off-by: default avatarChris Mason <clm@fb.com>
parent 536cd964

fs/btrfs/send.c

+0 −33
Original line number Diff line number Diff line
@@ -4618,7 +4618,6 @@ out: 
static int full_send_tree(struct send_ctx *sctx)

{

	int ret;

	struct btrfs_trans_handle *trans = NULL;

	struct btrfs_root *send_root = sctx->send_root;

	struct btrfs_key key;

	struct btrfs_key found_key;
@@ -4640,19 +4639,6 @@ static int full_send_tree(struct send_ctx *sctx) 
	key.type = BTRFS_INODE_ITEM_KEY;

	key.offset = 0;



join_trans:

	/*

	 * We need to make sure the transaction does not get committed

	 * while we do anything on commit roots. Join a transaction to prevent

	 * this.

	 */

	trans = btrfs_join_transaction(send_root);

	if (IS_ERR(trans)) {

		ret = PTR_ERR(trans);

		trans = NULL;

		goto out;

	}



	/*

	 * Make sure the tree has not changed after re-joining. We detect this

	 * by comparing start_ctransid and ctransid. They should always match.
@@ -4676,19 +4662,6 @@ join_trans: 
		goto out_finish;



	while (1) {

		/*

		 * When someone want to commit while we iterate, end the

		 * joined transaction and rejoin.

		 */

		if (btrfs_should_end_transaction(trans, send_root)) {

			ret = btrfs_end_transaction(trans, send_root);

			trans = NULL;

			if (ret < 0)

				goto out;

			btrfs_release_path(path);

			goto join_trans;

		}



		eb = path->nodes[0];

		slot = path->slots[0];

		btrfs_item_key_to_cpu(eb, &found_key, slot);
@@ -4716,12 +4689,6 @@ out_finish: 


out:

	btrfs_free_path(path);

	if (trans) {

		if (!ret)

			ret = btrfs_end_transaction(trans, send_root);

		else

			btrfs_end_transaction(trans, send_root);

	}

	return ret;

}