[PATCH] mm: zswap: drop list_lru param from zswap_lru_add() and _del()

[PATCH] mm: zswap: drop list_lru param from zswap_lru_add() and _del()

[Wilson Felipe Pereira]

Since zswap_lru_add() and zswap_lru_del() are only called with the global
zswap_list_lru, remove the redundant list_lru argument and use
zswap_list_lru directly.

Signed-off-by: Wilson Felipe Pereira <wfelipe@google.com>
---
 mm/zswap.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/mm/zswap.c b/mm/zswap.c
index 761cd699e0a3e..a810524c76217 100644
--- a/mm/zswap.c
+++ b/mm/zswap.c
@@ -665,7 +665,7 @@ static inline int entry_to_nid(struct zswap_entry *entry)
 	return page_to_nid(virt_to_page(entry));
 }
 
-static void zswap_lru_add(struct list_lru *list_lru, struct zswap_entry *entry)
+static void zswap_lru_add(struct zswap_entry *entry)
 {
 	int nid = entry_to_nid(entry);
 	struct mem_cgroup *memcg;
@@ -684,11 +684,11 @@ static void zswap_lru_add(struct list_lru *list_lru, struct zswap_entry *entry)
 	rcu_read_lock();
 	memcg = mem_cgroup_from_entry(entry);
 	/* will always succeed */
-	list_lru_add(list_lru, &entry->lru, nid, memcg);
+	list_lru_add(&zswap_list_lru, &entry->lru, nid, memcg);
 	rcu_read_unlock();
 }
 
-static void zswap_lru_del(struct list_lru *list_lru, struct zswap_entry *entry)
+static void zswap_lru_del(struct zswap_entry *entry)
 {
 	int nid = entry_to_nid(entry);
 	struct mem_cgroup *memcg;
@@ -696,7 +696,7 @@ static void zswap_lru_del(struct list_lru *list_lru, struct zswap_entry *entry)
 	rcu_read_lock();
 	memcg = mem_cgroup_from_entry(entry);
 	/* will always succeed */
-	list_lru_del(list_lru, &entry->lru, nid, memcg);
+	list_lru_del(&zswap_list_lru, &entry->lru, nid, memcg);
 	rcu_read_unlock();
 }
 
@@ -764,7 +764,7 @@ static void zswap_entry_cache_free(struct zswap_entry *entry)
  */
 static void zswap_entry_free(struct zswap_entry *entry)
 {
-	zswap_lru_del(&zswap_list_lru, entry);
+	zswap_lru_del(entry);
 	zs_free(entry->pool->zs_pool, entry->handle);
 	zswap_pool_put(entry->pool);
 	if (entry->objcg) {
@@ -1461,7 +1461,7 @@ static bool zswap_store_page(struct page *page,
 	entry->referenced = true;
 	if (entry->length) {
 		INIT_LIST_HEAD(&entry->lru);
-		zswap_lru_add(&zswap_list_lru, entry);
+		zswap_lru_add(entry);
 	}
 
 	return true;
-- 
2.55.0.508.g3f0d502094-goog

Re: [PATCH] mm: zswap: drop list_lru param from zswap_lru_add() and _del()

[Johannes Weiner]

On Fri, Jul 31, 2026 at 05:37:06AM +0000, Wilson Felipe Pereira wrote:
> Since zswap_lru_add() and zswap_lru_del() are only called with the global
> zswap_list_lru, remove the redundant list_lru argument and use
> zswap_list_lru directly.
> 
> Signed-off-by: Wilson Felipe Pereira <wfelipe@google.com>

Acked-by: Johannes Weiner <hannes@cmpxchg.org>

Re: [PATCH] mm: zswap: drop list_lru param from zswap_lru_add() and _del()

[Yosry Ahmed]

On Thu, Jul 30, 2026 at 10:37 PM Wilson Felipe Pereira
<wfelipe@google.com> wrote:
>
> Since zswap_lru_add() and zswap_lru_del() are only called with the global
> zswap_list_lru, remove the redundant list_lru argument and use
> zswap_list_lru directly.
>
> Signed-off-by: Wilson Felipe Pereira <wfelipe@google.com>

Acked-by: Yosry Ahmed <yosry@kernel.org>

Re: [PATCH] mm: zswap: drop list_lru param from zswap_lru_add() and _del()

[SJ Park]

On Fri, 31 Jul 2026 05:37:06 +0000 Wilson Felipe Pereira <wfelipe@google.com> wrote:

> Since zswap_lru_add() and zswap_lru_del() are only called with the global
> zswap_list_lru, remove the redundant list_lru argument and use
> zswap_list_lru directly.

Looks good and making sense to me.

> 
> Signed-off-by: Wilson Felipe Pereira <wfelipe@google.com>

Reviewed-by: SJ Park <sj@kernel.org>


Thanks,
SJ

[...]