From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: Gao Xiang <hsiangkao@linux.alibaba.com>
Cc: stable@vger.kernel.org, linux-erofs@lists.ozlabs.org,
Yue Hu <huyue2@yulong.com>, Gao Xiang <xiang@kernel.org>
Subject: Re: [PATCH 5.10.y 1/2] erofs: remove the occupied parameter from z_erofs_pagevec_enqueue()
Date: Fri, 19 Nov 2021 15:27:16 +0100 [thread overview]
Message-ID: <YZe0RBWxactlMaN0@kroah.com> (raw)
In-Reply-To: <20211116010819.122905-1-hsiangkao@linux.alibaba.com>
On Tue, Nov 16, 2021 at 09:08:18AM +0800, Gao Xiang wrote:
> 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>
> Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com>
> ---
> Gao Xiang: Apply this trivial cleanup (no behavior change) for easier
> backporting.
>
> fs/erofs/zdata.c | 4 +---
> fs/erofs/zpvec.h | 5 +----
> 2 files changed, 2 insertions(+), 7 deletions(-)
>
> diff --git a/fs/erofs/zdata.c b/fs/erofs/zdata.c
> index 86fd3bf62af6..ca27d3e47857 100644
> --- a/fs/erofs/zdata.c
> +++ b/fs/erofs/zdata.c
> @@ -282,7 +282,6 @@ static int z_erofs_attach_page(struct z_erofs_collector *clt,
> enum z_erofs_page_type type)
> {
> int ret;
> - bool occupied;
>
> /* give priority for inplaceio */
> if (clt->mode >= COLLECT_PRIMARY &&
> @@ -290,8 +289,7 @@ static int z_erofs_attach_page(struct z_erofs_collector *clt,
> z_erofs_try_inplace_io(clt, page))
> return 0;
>
> - ret = z_erofs_pagevec_enqueue(&clt->vector,
> - page, type, &occupied);
> + ret = z_erofs_pagevec_enqueue(&clt->vector, page, type);
> clt->cl->vcnt += (unsigned int)ret;
>
> return ret ? 0 : -EAGAIN;
> diff --git a/fs/erofs/zpvec.h b/fs/erofs/zpvec.h
> index 1d67cbd38704..95a620739e6a 100644
> --- a/fs/erofs/zpvec.h
> +++ b/fs/erofs/zpvec.h
> @@ -107,10 +107,8 @@ static inline void z_erofs_pagevec_ctor_init(struct z_erofs_pagevec_ctor *ctor,
>
> static inline bool z_erofs_pagevec_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 (!ctor->next && type)
> if (ctor->index + 1 == ctor->nr)
> return false;
> @@ -125,7 +123,6 @@ static inline bool z_erofs_pagevec_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++] = tagptr_fold(erofs_vtptr_t, page, type);
> return true;
> --
> 2.24.4
>
All now queued up, thanks.
greg k-h
prev parent reply other threads:[~2021-11-19 14:27 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-15 13:37 FAILED: patch "[PATCH] erofs: fix unsafe pagevec reuse of hooked pclusters" failed to apply to 5.10-stable tree gregkh
2021-11-16 1:08 ` [PATCH 5.10.y 1/2] erofs: remove the occupied parameter from z_erofs_pagevec_enqueue() Gao Xiang
2021-11-16 1:08 ` [PATCH 5.10.y 2/2] erofs: fix unsafe pagevec reuse of hooked pclusters Gao Xiang
2021-11-19 14:27 ` Greg Kroah-Hartman [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YZe0RBWxactlMaN0@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=hsiangkao@linux.alibaba.com \
--cc=huyue2@yulong.com \
--cc=linux-erofs@lists.ozlabs.org \
--cc=stable@vger.kernel.org \
--cc=xiang@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).