2024-03-11 23:52:26

by Yosry Ahmed

Subject: [PATCH] mm: zswap: remove unnecessary check in zswap_find_zpool()

zswap_find_zpool() checks if ZSWAP_NR_ZPOOLS > 1, which is always true.
This is a remnant from a patch version that had ZSWAP_NR_ZPOOLS as a
config option and never made it upstream. Remove the unnecessary check.

Signed-off-by: Yosry Ahmed <[email protected]>
---
mm/zswap.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/mm/zswap.c b/mm/zswap.c
index 9a32377520827..c6267b5e0999a 100644
--- a/mm/zswap.c
+++ b/mm/zswap.c
@@ -884,12 +884,7 @@ static void zswap_entry_cache_free(struct zswap_entry *entry)

static struct zpool *zswap_find_zpool(struct zswap_entry *entry)
{
- int i = 0;
-
- if (ZSWAP_NR_ZPOOLS > 1)
- i = hash_ptr(entry, ilog2(ZSWAP_NR_ZPOOLS));
-
- return entry->pool->zpools[i];
+ return entry->pool->zpools[hash_ptr(entry, ilog2(ZSWAP_NR_ZPOOLS))];
}

/*
--
2.44.0.278.ge034bb2e1d-goog

2024-03-12 04:58:35

by Chengming Zhou

Subject: Re: [PATCH] mm: zswap: remove unnecessary check in zswap_find_zpool()

On 2024/3/12 07:52, Yosry Ahmed wrote:
> zswap_find_zpool() checks if ZSWAP_NR_ZPOOLS > 1, which is always true.
> This is a remnant from a patch version that had ZSWAP_NR_ZPOOLS as a
> config option and never made it upstream. Remove the unnecessary check.
>
> Signed-off-by: Yosry Ahmed <[email protected]>

Looks good to me!

Reviewed-by: Chengming Zhou <[email protected]>

Thanks.

> ---
> mm/zswap.c | 7 +------
> 1 file changed, 1 insertion(+), 6 deletions(-)
>
> diff --git a/mm/zswap.c b/mm/zswap.c
> index 9a32377520827..c6267b5e0999a 100644
> --- a/mm/zswap.c
> +++ b/mm/zswap.c
> @@ -884,12 +884,7 @@ static void zswap_entry_cache_free(struct zswap_entry *entry)
>
> static struct zpool *zswap_find_zpool(struct zswap_entry *entry)
> {
> - int i = 0;
> -
> - if (ZSWAP_NR_ZPOOLS > 1)
> - i = hash_ptr(entry, ilog2(ZSWAP_NR_ZPOOLS));
> -
> - return entry->pool->zpools[i];
> + return entry->pool->zpools[hash_ptr(entry, ilog2(ZSWAP_NR_ZPOOLS))];
> }
>
> /*

2024-03-12 09:36:01

by Nhat Pham

Subject: Re: [PATCH] mm: zswap: remove unnecessary check in zswap_find_zpool()

On Tue, Mar 12, 2024 at 6:52 AM Yosry Ahmed <[email protected]> wrote:
>
> zswap_find_zpool() checks if ZSWAP_NR_ZPOOLS > 1, which is always true.
> This is a remnant from a patch version that had ZSWAP_NR_ZPOOLS as a
> config option and never made it upstream. Remove the unnecessary check.

Do we need a Fixes: tag for this? I guess it's not a bug hmmm.

>
> Signed-off-by: Yosry Ahmed <[email protected]>

Reviewed-by: Nhat Pham <[email protected]>

2024-03-12 10:22:56

by Yosry Ahmed

Subject: Re: [PATCH] mm: zswap: remove unnecessary check in zswap_find_zpool()

On Tue, Mar 12, 2024 at 2:35 AM Nhat Pham <[email protected]> wrote:
>
> On Tue, Mar 12, 2024 at 6:52 AM Yosry Ahmed <[email protected]> wrote:
> >
> > zswap_find_zpool() checks if ZSWAP_NR_ZPOOLS > 1, which is always true.
> > This is a remnant from a patch version that had ZSWAP_NR_ZPOOLS as a
> > config option and never made it upstream. Remove the unnecessary check.
>
> Do we need a Fixes: tag for this? I guess it's not a bug hmmm.

The compiler should be producing the exact same code either way, so I
would say no. It's just a cleanup.

>
> >
> > Signed-off-by: Yosry Ahmed <[email protected]>
>
> Reviewed-by: Nhat Pham <[email protected]>

Thanks!

2024-03-12 19:17:58

by Johannes Weiner

Subject: Re: [PATCH] mm: zswap: remove unnecessary check in zswap_find_zpool()

On Mon, Mar 11, 2024 at 11:52:10PM +0000, Yosry Ahmed wrote:
> zswap_find_zpool() checks if ZSWAP_NR_ZPOOLS > 1, which is always true.
> This is a remnant from a patch version that had ZSWAP_NR_ZPOOLS as a
> config option and never made it upstream. Remove the unnecessary check.
>
> Signed-off-by: Yosry Ahmed <[email protected]>

Acked-by: Johannes Weiner <[email protected]>