This is a note to let you know that I've just added the patch titled erofs: remove the occupied parameter from z_erofs_pagevec_enqueue() to the 4.19-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: erofs-remove-the-occupied-parameter-from-z_erofs_pagevec_enqueue.patch and it can be found in the queue-4.19 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From foo@baz Fri Nov 19 03:26:51 PM CET 2021 From: Gao Xiang <hsiangkao@xxxxxxxxxxxxxxxxx> Date: Tue, 16 Nov 2021 10:41:52 +0800 Subject: erofs: remove the occupied parameter from z_erofs_pagevec_enqueue() To: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>, stable@xxxxxxxxxxxxxxx Cc: linux-erofs@xxxxxxxxxxxxxxxx, Yue Hu <huyue2@xxxxxxxxxx>, Gao Xiang <xiang@xxxxxxxxxx>, Gao Xiang <hsiangkao@xxxxxxxxxxxxxxxxx> Message-ID: <20211116024153.245131-1-hsiangkao@xxxxxxxxxxxxxxxxx> From: Yue Hu <huyue2@xxxxxxxxxx> 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@xxxxxxxxx Signed-off-by: Yue Hu <huyue2@xxxxxxxxxx> Reviewed-by: Gao Xiang <xiang@xxxxxxxxxx> Signed-off-by: Gao Xiang <xiang@xxxxxxxxxx> [ Gao Xiang: handle 4.19 codebase conflicts manually. ] Signed-off-by: Gao Xiang <hsiangkao@xxxxxxxxxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- 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; Patches currently in stable-queue which might be from hsiangkao@xxxxxxxxxxxxxxxxx are queue-4.19/lib-xz-validate-the-value-before-assigning-it-to-an-.patch queue-4.19/erofs-fix-unsafe-pagevec-reuse-of-hooked-pclusters.patch queue-4.19/lib-xz-avoid-overlapping-memcpy-with-invalid-input-w.patch queue-4.19/erofs-remove-the-occupied-parameter-from-z_erofs_pagevec_enqueue.patch