mm: zswap: inline and remove zswap_entry_find_get()

There is only one caller and the function is trivial. Inline it.

Link: https://lkml.kernel.org/r/20240130014208.565554-3-hannes@cmpxchg.org
Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
Reviewed-by: Nhat Pham <nphamcs@gmail.com>
Acked-by: Yosry Ahmed <yosryahmed@google.com>
Reviewed-by: Chengming Zhou <zhouchengming@bytedance.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/mm/zswap.c b/mm/zswap.c
index 5cb79cb497c06bd4e2f05ed54a556b8f03c2c7ea..3df8b6329cf5c5c3d068db85d01f29d1ecfd3ed3 100644 (file)
--- a/mm/zswap.c
+++ b/mm/zswap.c
@@ -558,19 +558,6 @@ static void zswap_entry_put(struct zswap_entry *entry)
        }
 }
 
-/* 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)