The quilt patch titled
Subject: mm: zswap: inline and remove zswap_entry_find_get()
has been removed from the -mm tree. Its filename was
mm-zswap-inline-and-remove-zswap_entry_find_get.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: Johannes Weiner <hannes@xxxxxxxxxxx>
Subject: mm: zswap: inline and remove zswap_entry_find_get()
Date: Mon, 29 Jan 2024 20:36:38 -0500
There is only one caller and the function is trivial. Inline it.
Link: https://lkml.kernel.org/r/20240130014208.565554-3-hannes@xxxxxxxxxxx
Signed-off-by: Johannes Weiner <hannes@xxxxxxxxxxx>
Reviewed-by: Nhat Pham <nphamcs@xxxxxxxxx>
Acked-by: Yosry Ahmed <yosryahmed@xxxxxxxxxx>
Reviewed-by: Chengming Zhou <zhouchengming@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/zswap.c | 17 ++---------------
1 file changed, 2 insertions(+), 15 deletions(-)
--- a/mm/zswap.c~mm-zswap-inline-and-remove-zswap_entry_find_get
+++ a/mm/zswap.c
@@ -558,19 +558,6 @@ static void zswap_entry_put(struct zswap
}
}
-/* caller must hold the tree lock */
-static struct zswap_entry *zswap_entry_find_get(struct rb_root *root,
- pgoff_t offset)
-{
- struct zswap_entry *entry;
-
- entry = zswap_rb_search(root, offset);
- if (entry)
- zswap_entry_get(entry);
-
- return entry;
-}
-
/*********************************
* shrinker functions
**********************************/
@@ -1708,13 +1695,13 @@ bool zswap_load(struct folio *folio)
VM_WARN_ON_ONCE(!folio_test_locked(folio));
- /* find */
spin_lock(&tree->lock);
- entry = zswap_entry_find_get(&tree->rbroot, offset);
+ entry = zswap_rb_search(&tree->rbroot, offset);
if (!entry) {
spin_unlock(&tree->lock);
return false;
}
+ zswap_entry_get(entry);
spin_unlock(&tree->lock);
if (entry->length)
_
Patches currently in -mm which might be from hannes@xxxxxxxxxxx are
