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 <yosryahmed@xxxxxxxxxx>
Looks good to me!
Reviewed-by: Chengming Zhou <chengming.zhou@xxxxxxxxx>
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))];
> }
>
> /*
