[merged mm-stable] mm-zswap-remove-unused-tree-argument-in-zswap_entry_put.patch removed from -mm tree

[merged mm-stable] mm-zswap-remove-unused-tree-argument-in-zswap_entry_put.patch removed from -mm tree

[Andrew Morton]

The quilt patch titled
     Subject: mm: zswap: remove unused tree argument in zswap_entry_put()
has been removed from the -mm tree.  Its filename was
     mm-zswap-remove-unused-tree-argument-in-zswap_entry_put.patch

This patch was dropped because it was merged into the mm-stable branch
of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Yosry Ahmed <yosryahmed@google.com>
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@google.com
Signed-off-by: Yosry Ahmed <yosryahmed@google.com>
Reviewed-by: Chengming Zhou <zhouchengming@bytedance.com>
Acked-by: Johannes Weiner <hannes@cmpxchg.org>
Reviewed-by: Nhat Pham <nphamcs@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 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
@@ -568,8 +568,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;
 
@@ -852,7 +851,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,
@@ -921,7 +920,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@google.com are