]> git.baikalelectronics.ru Git - 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)
commit71b63ff340df54a7d59995f0e6f3ee8d98ddc85e
treef5bebc158558c68be9852748be356be134f6175d
parente238ecc7ee0ccd65e93601542cb6a5ad10fc0e51
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: 23f2ab9cb9471 ("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