The patch titled
Subject: mm: zswap: remove unused tree argument in zswap_entry_put()
has been added to the -mm mm-unstable branch. Its filename is
mm-zswap-remove-unused-tree-argument-in-zswap_entry_put.patch
This patch will shortly appear at
https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/mm-zswap-remove-unused-tree-argument-in-zswap_entry_put.patch
This patch will later appear in the mm-unstable branch at
git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next via the mm-everything
branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
and is updated there every 2-3 working days
------------------------------------------------------
From: Yosry Ahmed <yosryahmed@xxxxxxxxxx>
Subject: mm: zswap: remove unused tree argument in zswap_entry_put()
Date: Thu, 25 Jan 2024 08:14:23 +0000
Commit 7310895779624 ("mm: zswap: tighten up entry invalidation") removed
the usage of tree argument, delete it.
Link: https://lkml.kernel.org/r/20240125081423.1200336-1-yosryahmed@xxxxxxxxxx
Signed-off-by: Yosry Ahmed <yosryahmed@xxxxxxxxxx>
Reviewed-by: Chengming Zhou <zhouchengming@xxxxxxxxxxxxx>
Acked-by: Johannes Weiner <hannes@xxxxxxxxxxx>
Reviewed-by: Nhat Pham <nphamcs@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/zswap.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
--- a/mm/zswap.c~mm-zswap-remove-unused-tree-argument-in-zswap_entry_put
+++ a/mm/zswap.c
@@ -569,8 +569,7 @@ static void zswap_entry_get(struct zswap
/* caller must hold the tree lock
* remove from the tree and free it, if nobody reference the entry
*/
-static void zswap_entry_put(struct zswap_tree *tree,
- struct zswap_entry *entry)
+static void zswap_entry_put(struct zswap_entry *entry)
{
int refcount = --entry->refcount;
@@ -853,7 +852,7 @@ static void zswap_invalidate_entry(struc
struct zswap_entry *entry)
{
if (zswap_rb_erase(&tree->rbroot, entry))
- zswap_entry_put(tree, entry);
+ zswap_entry_put(entry);
}
static enum lru_status shrink_memcg_cb(struct list_head *item, struct list_lru_one *l,
@@ -924,7 +923,7 @@ static enum lru_status shrink_memcg_cb(s
put_unlock:
/* Drop local reference */
- zswap_entry_put(tree, entry);
+ zswap_entry_put(entry);
unlock:
spin_unlock(&tree->lock);
spin_lock(lock);
@@ -1754,7 +1753,7 @@ bool zswap_load(struct folio *folio)
zswap_lru_del(&entry->pool->list_lru, entry);
zswap_lru_add(&entry->pool->list_lru, entry);
}
- zswap_entry_put(tree, entry);
+ zswap_entry_put(entry);
spin_unlock(&tree->lock);
return true;
_
Patches currently in -mm which might be from yosryahmed@xxxxxxxxxx are
maintainers-supplement-of-zswap-maintainers-update.patch
mm-swap-enforce-updating-inuse_pages-at-the-end-of-swap_range_free.patch
mm-zswap-remove-unnecessary-trees-cleanups-in-zswap_swapoff.patch
mm-zswap-remove-unused-tree-argument-in-zswap_entry_put.patch
