Commit 18d3bff4 authored Dec 16, 2020 by Josef Bacik Committed by David Sterba Jan 18, 2021

btrfs: don't get an EINTR during drop_snapshot for reloc

This was partially fixed by f3e3d9cc ("btrfs: avoid possible signal
interruption of btrfs_drop_snapshot() on relocation tree"), however it
missed a spot when we restart a trans handle because we need to end the
transaction. The fix is the same, simply use btrfs_join_transaction()
instead of btrfs_start_transaction() when deleting reloc roots.

Fixes: f3e3d9cc ("btrfs: avoid possible signal interruption of btrfs_drop_snapshot() on relocation tree")
CC: stable@vger.kernel.org # 5.4+
Signed-off-by: Josef Bacik <josef@toxicpanda.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

parent 518837e6

fs/btrfs/extent-tree.c

+9 −1

Original line number	Diff line number	Diff line
		@@ -5549,6 +5549,14 @@ int btrfs_drop_snapshot(struct btrfs_root *root, int update_ref, int for_reloc)
		goto out_free;
		}

		/*
		* Use join to avoid potential EINTR from transaction
		* start. See wait_reserve_ticket and the whole
		* reservation callchain.
		*/
		if (for_reloc)
		trans = btrfs_join_transaction(tree_root);
		else
		trans = btrfs_start_transaction(tree_root, 0);
		if (IS_ERR(trans)) {
		err = PTR_ERR(trans);