]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commit
btrfs: fix missing error return in btrfs_drop_snapshot
authorJeff Mahoney <jeffm@suse.com>
Mon, 4 Dec 2017 18:11:45 +0000 (13:11 -0500)
committerDavid Sterba <dsterba@suse.com>
Wed, 6 Dec 2017 23:30:29 +0000 (00:30 +0100)
commite19182c0fff451e3744c1107d98f072e7ca377a0
treef5bebc158558c68be9852748be356be134f6175d
parent692826b2738101549f032a761a9191636e83be4e
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: 79787eaab4612 ("btrfs: replace many BUG_ONs with proper error handling")
Cc: <stable@vger.kernel.org> # v3.4+
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
fs/btrfs/extent-tree.c