]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
btrfs: convert logic BUG_ON()'s in replace_path to ASSERT()'s
authorJosef Bacik <josef@toxicpanda.com>
Fri, 12 Mar 2021 20:25:21 +0000 (15:25 -0500)
committerStefan Bader <stefan.bader@canonical.com>
Wed, 19 May 2021 08:32:05 +0000 (10:32 +0200)
BugLink: https://bugs.launchpad.net/bugs/1928857
[ Upstream commit 7a9213a93546e7eaef90e6e153af6b8fc7553f10 ]

A few BUG_ON()'s in replace_path are purely to keep us from making
logical mistakes, so replace them with ASSERT()'s.

Reviewed-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: Josef Bacik <josef@toxicpanda.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
fs/btrfs/relocation.c

index 73dcfe6e18f24e54a146adef9d9b51a45723bbbf..efe3ce88b8efae16133c5b3c8b13d0866fb4275d 100644 (file)
@@ -1204,8 +1204,8 @@ int replace_path(struct btrfs_trans_handle *trans, struct reloc_control *rc,
        int ret;
        int slot;
 
-       BUG_ON(src->root_key.objectid != BTRFS_TREE_RELOC_OBJECTID);
-       BUG_ON(dest->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID);
+       ASSERT(src->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID);
+       ASSERT(dest->root_key.objectid != BTRFS_TREE_RELOC_OBJECTID);
 
        last_snapshot = btrfs_root_last_snapshot(&src->root_item);
 again:
@@ -1236,7 +1236,7 @@ again:
        parent = eb;
        while (1) {
                level = btrfs_header_level(parent);
-               BUG_ON(level < lowest_level);
+               ASSERT(level >= lowest_level);
 
                ret = btrfs_bin_search(parent, &key, &slot);
                if (ret < 0)