On Tue, Nov 16, 2021 at 09:08:18AM +0800, Gao Xiang wrote: > From: Yue Hu <[email protected]> > > 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/[email protected] > Signed-off-by: Yue Hu <[email protected]> > Reviewed-by: Gao Xiang <[email protected]> > Signed-off-by: Gao Xiang <[email protected]> > Signed-off-by: Gao Xiang <[email protected]> > --- > 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
