summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Sterba <dsterba@suse.com>2020-02-25 15:05:53 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-10-01 13:14:46 +0200
commit5915b8ecb176e48f9fbb91e7004053097fc93ec7 (patch)
treee50e446a0e2a962e18cd18e62086f86c788ad346
parent8201fdac15d67f692c99ac15d867a413a0d6553a (diff)
downloadlinux-stable-5915b8ecb176e48f9fbb91e7004053097fc93ec7.tar.gz
linux-stable-5915b8ecb176e48f9fbb91e7004053097fc93ec7.tar.bz2
linux-stable-5915b8ecb176e48f9fbb91e7004053097fc93ec7.zip
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 cb1b69f4508a ("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>
-rw-r--r--fs/btrfs/extent-tree.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 319a89d4d073..ce5e0f6c6af4 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -9098,8 +9098,6 @@ out:
*/
if (!for_reloc && !root_dropped)
btrfs_add_dead_root(root);
- if (err && err != -EAGAIN)
- btrfs_handle_fs_error(fs_info, err, NULL);
return err;
}