[PATCH] erofs: remove the occupied parameter from z_erofs_pagevec_enqueue()

[Yue Hu]

On Mon, 19 Apr 2021 18:56:55 +0800
Gao Xiang <hsiangkao at redhat.com> wrote:

> Hi Yue,
> 
> On Mon, Apr 19, 2021 at 06:26:23PM +0800, Yue Hu wrote:
> > From: Yue Hu <huyue2 at yulong.com>
> > 
> > No any behavior to variable occupied in z_erofs_attach_page() which
> > is only caller to z_erofs_pagevec_enqueue().
> > 
> > Signed-off-by: Yue Hu <huyue2 at yulong.com>  
> 
> Thanks for your patch :) the variable `occupied' also has its usage
> from pagevec implementation itself. But I agree with you on this
> since it's actually unused now.
> 
> As we're in final-rc of 5.12 now, I've freezed the patches for 5.13.
> I'll put off this cleanup to the next merge queue...
> 
> (btw, for erofs kernel patches, could you kindly Cc: linux-kernel
>  mailing list next time as well... since it's part of linux kernel
>  as well.)

ok, keep in mind.

Thanks.

> 
> Thanks,
> Gao Xiang
> 
> > ---
> >  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 3851e1a..e9231da 100644
> > --- a/fs/erofs/zdata.c
> > +++ b/fs/erofs/zdata.c
> > @@ -298,7 +298,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 &&
> > @@ -306,8 +305,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 1d67cbd..95a6207 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;
> > -- 
> > 1.9.1
> >   
>