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

Commit e19182c0 authored by Jeff Mahoney's avatar Jeff Mahoney Committed by David Sterba
Browse files

btrfs: fix missing error return in btrfs_drop_snapshot 



If btrfs_del_root fails in btrfs_drop_snapshot, we'll pick up the
error but then return 0 anyway due to mixing err and ret.

Fixes: 79787eaa ("btrfs: replace many BUG_ONs with proper error handling")
Cc: <stable@vger.kernel.org> # v3.4+
Signed-off-by: default avatarJeff Mahoney <jeffm@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 692826b2

fs/btrfs/extent-tree.c

+1 −0
Original line number Diff line number Diff line
@@ -9220,6 +9220,7 @@ int btrfs_drop_snapshot(struct btrfs_root *root, 
	ret = btrfs_del_root(trans, fs_info, &root->root_key);

	if (ret) {

		btrfs_abort_transaction(trans, ret);

		err = ret;

		goto out_end_trans;

	}