erofs: remove the occupied parameter from z_erofs_pagevec_enqueue()

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>

diff --git a/drivers/staging/erofs/unzip_pagevec.h b/drivers/staging/erofs/unzip_pagevec.h
index 23856ba2742d882dd76ef6864ba09f6ad4d449f4..64724dd1e04e4afa3fa53b2d04a2c03484b4b9da 100644 (file)
--- 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_init(struct z_erofs_pagevec_ctor *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_erofs_pagevec_ctor *ctor,
        /* 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++] =

diff --git a/drivers/staging/erofs/unzip_vle.c b/drivers/staging/erofs/unzip_vle.c
index 0f1558c6747efdd9782226b4631c3fa0507b3230..48c21a4d5dc8b8917d0e1858adad1b448f3d7e58 100644 (file)
--- 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;