lkml.org 
[lkml]   [2019]   [Feb]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 144/152] staging: erofs: unzip_vle_lz4.c,utils.c: rectify BUG_ONs
    Date
    4.19-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Gao Xiang <gaoxiang25@huawei.com>

    commit b8e076a6ef253e763bfdb81e5c72bcc828b0fbeb upstream.

    remove all redundant BUG_ONs, and turn the rest
    useful usages to DBG_BUGONs.

    Signed-off-by: Gao Xiang <gaoxiang25@huawei.com>
    Reviewed-by: Chao Yu <yuchao0@huawei.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/staging/erofs/unzip_vle_lz4.c | 2 +-
    drivers/staging/erofs/utils.c | 12 ++++++------
    2 files changed, 7 insertions(+), 7 deletions(-)

    --- a/drivers/staging/erofs/unzip_vle_lz4.c
    +++ b/drivers/staging/erofs/unzip_vle_lz4.c
    @@ -57,7 +57,7 @@ int z_erofs_vle_plain_copy(struct page *
    if (compressed_pages[j] != page)
    continue;

    - BUG_ON(mirrored[j]);
    + DBG_BUGON(mirrored[j]);
    memcpy(percpu_data + j * PAGE_SIZE, dst, PAGE_SIZE);
    mirrored[j] = true;
    break;
    --- a/drivers/staging/erofs/utils.c
    +++ b/drivers/staging/erofs/utils.c
    @@ -23,9 +23,6 @@ struct page *erofs_allocpage(struct list
    list_del(&page->lru);
    } else {
    page = alloc_pages(gfp | __GFP_NOFAIL, 0);
    -
    - BUG_ON(page == NULL);
    - BUG_ON(page->mapping != NULL);
    }
    return page;
    }
    @@ -60,7 +57,7 @@ repeat:
    /* decrease refcount added by erofs_workgroup_put */
    if (unlikely(oldcount == 1))
    atomic_long_dec(&erofs_global_shrink_cnt);
    - BUG_ON(index != grp->index);
    + DBG_BUGON(index != grp->index);
    }
    rcu_read_unlock();
    return grp;
    @@ -73,8 +70,11 @@ int erofs_register_workgroup(struct supe
    struct erofs_sb_info *sbi;
    int err;

    - /* grp->refcount should not < 1 */
    - BUG_ON(!atomic_read(&grp->refcount));
    + /* grp shouldn't be broken or used before */
    + if (unlikely(atomic_read(&grp->refcount) != 1)) {
    + DBG_BUGON(1);
    + return -EINVAL;
    + }

    err = radix_tree_preload(GFP_NOFS);
    if (err)

    \
     
     \ /
      Last update: 2019-02-25 22:47    [W:4.084 / U:2.100 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site