Commit 2b8c5a91 authored Feb 25, 2020 by David Sterba Committed by Greg Kroah-Hartman Oct 01, 2020

btrfs: don't force read-only after error in drop snapshot



[ Upstream commit 7c09c03091ac562ddca2b393e5d65c1d37da79f1 ]

Deleting a subvolume on a full filesystem leads to ENOSPC followed by a
forced read-only. This is not a transaction abort and the filesystem is
otherwise ok, so the error should be just propagated to the callers.

This is caused by unnecessary call to btrfs_handle_fs_error for all
errors, except EAGAIN. This does not make sense as the standard
transaction abort mechanism is in btrfs_drop_snapshot so all relevant
failures are handled.

Originally in commit cb1b69f4 ("Btrfs: forced readonly when
btrfs_drop_snapshot() fails") there was no return value at all, so the
btrfs_std_error made some sense but once the error handling and
propagation has been implemented we don't need it anymore.

Signed-off-by: David Sterba <dsterba@suse.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent d8593121

fs/btrfs/extent-tree.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -9435,8 +9435,6 @@ int btrfs_drop_snapshot(struct btrfs_root *root,
		*/
		if (!for_reloc && root_dropped == false)
		btrfs_add_dead_root(root);
		if (err && err != -EAGAIN)
		btrfs_handle_fs_error(fs_info, err, NULL);
		return err;
		}