2021-08-31 10:38:02

by Yue Hu

Subject: [PATCH] erofs: remove the pagepool parameter from z_erofs_shifted_transform()

From: Yue Hu <[email protected]>

We don't use the pagepool for plain format, remove it.

Signed-off-by: Yue Hu <[email protected]>
---
fs/erofs/decompressor.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/fs/erofs/decompressor.c b/fs/erofs/decompressor.c
index a5bc4b1..8f50a36 100644
--- a/fs/erofs/decompressor.c
+++ b/fs/erofs/decompressor.c
@@ -360,8 +360,7 @@ static int z_erofs_decompress_generic(struct z_erofs_decompress_req *rq,
return ret;
}

-static int z_erofs_shifted_transform(const struct z_erofs_decompress_req *rq,
- struct list_head *pagepool)
+static int z_erofs_shifted_transform(const struct z_erofs_decompress_req *rq)
{
const unsigned int nrpages_out =
PAGE_ALIGN(rq->pageofs_out + rq->outputsize) >> PAGE_SHIFT;
@@ -403,6 +402,6 @@ int z_erofs_decompress(struct z_erofs_decompress_req *rq,
struct list_head *pagepool)
{
if (rq->alg == Z_EROFS_COMPRESSION_SHIFTED)
- return z_erofs_shifted_transform(rq, pagepool);
+ return z_erofs_shifted_transform(rq);
return z_erofs_decompress_generic(rq, pagepool);
}
--
1.9.1

2021-09-03 03:12:55

by Gao Xiang

Subject: Re: [PATCH] erofs: remove the pagepool parameter from z_erofs_shifted_transform()

Hi Yue,

On Tue, Aug 31, 2021 at 06:32:04PM +0800, Yue Hu wrote:
> From: Yue Hu <[email protected]>
>
> We don't use the pagepool for plain format, remove it.

In my LZMA patchset, I'll rearrange such interface to make LZMA
integration easier:
https://git.kernel.org/pub/scm/linux/kernel/git/xiang/linux.git/commit/?h=erofs/lzma&id=3fab9044a4fe9358e95e16780831640caf3de10b

This cleanup patch does no harm to that one, yet I think it has little
real impact (especially applying the patch above)... So I'd like to
hear Chao's suggestion about this as well. I'm fine in either ways.

(p.s. we are in 5.15 merge window, I will set up a new dev branch after
-rc1 is out.)

Thanks,
Gao Xiang

>
> Signed-off-by: Yue Hu <[email protected]>
> ---
> fs/erofs/decompressor.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/fs/erofs/decompressor.c b/fs/erofs/decompressor.c
> index a5bc4b1..8f50a36 100644
> --- a/fs/erofs/decompressor.c
> +++ b/fs/erofs/decompressor.c
> @@ -360,8 +360,7 @@ static int z_erofs_decompress_generic(struct z_erofs_decompress_req *rq,
> return ret;
> }
>
> -static int z_erofs_shifted_transform(const struct z_erofs_decompress_req *rq,
> - struct list_head *pagepool)
> +static int z_erofs_shifted_transform(const struct z_erofs_decompress_req *rq)
> {
> const unsigned int nrpages_out =
> PAGE_ALIGN(rq->pageofs_out + rq->outputsize) >> PAGE_SHIFT;
> @@ -403,6 +402,6 @@ int z_erofs_decompress(struct z_erofs_decompress_req *rq,
> struct list_head *pagepool)
> {
> if (rq->alg == Z_EROFS_COMPRESSION_SHIFTED)
> - return z_erofs_shifted_transform(rq, pagepool);
> + return z_erofs_shifted_transform(rq);
> return z_erofs_decompress_generic(rq, pagepool);
> }
> --
> 1.9.1