lkml.org 
[lkml]   [2021]   [May]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.11 127/342] btrfs: convert logic BUG_ON()s in replace_path to ASSERT()s
    Date
    From: Josef Bacik <josef@toxicpanda.com>

    [ 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>
    ---
    fs/btrfs/relocation.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
    index 73dcfe6e18f2..efe3ce88b8ef 100644
    --- a/fs/btrfs/relocation.c
    +++ b/fs/btrfs/relocation.c
    @@ -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)
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-05-10 14:02    [W:4.115 / U:0.128 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site