lkml.org 
[lkml]   [2021]   [Nov]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 257/323] erofs: remove the occupied parameter from z_erofs_pagevec_enqueue()
    Date
    From: Yue Hu <huyue2@yulong.com>

    commit 7dea3de7d384f4c8156e8bd93112ba6db1eb276c upstream.

    No any behavior to variable occupied in z_erofs_attach_page() which
    is only caller to z_erofs_pagevec_enqueue().

    Link: https://lore.kernel.org/r/20210419102623.2015-1-zbestahu@gmail.com
    Signed-off-by: Yue Hu <huyue2@yulong.com>
    Reviewed-by: Gao Xiang <xiang@kernel.org>
    Signed-off-by: Gao Xiang <xiang@kernel.org>
    [ Gao Xiang: handle 4.19 codebase conflicts manually. ]
    Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/staging/erofs/unzip_pagevec.h | 5 +----
    drivers/staging/erofs/unzip_vle.c | 4 +---
    2 files changed, 2 insertions(+), 7 deletions(-)

    --- a/drivers/staging/erofs/unzip_pagevec.h
    +++ b/drivers/staging/erofs/unzip_pagevec.h
    @@ -117,10 +117,8 @@ static inline void z_erofs_pagevec_ctor_
    static inline bool
    z_erofs_pagevec_ctor_enqueue(struct z_erofs_pagevec_ctor *ctor,
    struct page *page,
    - enum z_erofs_page_type type,
    - bool *occupied)
    + enum z_erofs_page_type type)
    {
    - *occupied = false;
    if (unlikely(ctor->next == NULL && type))
    if (ctor->index + 1 == ctor->nr)
    return false;
    @@ -135,7 +133,6 @@ z_erofs_pagevec_ctor_enqueue(struct z_er
    /* should remind that collector->next never equal to 1, 2 */
    if (type == (uintptr_t)ctor->next) {
    ctor->next = page;
    - *occupied = true;
    }

    ctor->pages[ctor->index++] =
    --- a/drivers/staging/erofs/unzip_vle.c
    +++ b/drivers/staging/erofs/unzip_vle.c
    @@ -234,7 +234,6 @@ static int z_erofs_vle_work_add_page(
    enum z_erofs_page_type type)
    {
    int ret;
    - bool occupied;

    /* give priority for the compressed data storage */
    if (builder->role >= Z_EROFS_VLE_WORK_PRIMARY &&
    @@ -242,8 +241,7 @@ static int z_erofs_vle_work_add_page(
    try_to_reuse_as_compressed_page(builder, page))
    return 0;

    - ret = z_erofs_pagevec_ctor_enqueue(&builder->vector,
    - page, type, &occupied);
    + ret = z_erofs_pagevec_ctor_enqueue(&builder->vector, page, type);
    builder->work->vcnt += (unsigned)ret;

    return ret ? 0 : -EAGAIN;

    \
     
     \ /
      Last update: 2021-11-24 14:16    [W:2.130 / U:0.060 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site