Commit 5b297f70 authored by Johannes Weiner's avatar Johannes Weiner Committed by Andrew Morton
Browse files

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: default avatarJohannes Weiner <hannes@cmpxchg.org>
Reviewed-by: default avatarNhat Pham <nphamcs@gmail.com>
Acked-by: default avatarYosry Ahmed <yosryahmed@google.com>
Reviewed-by: default avatarChengming Zhou <zhouchengming@bytedance.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 42398be2

mm/zswap.c

+2 −15
Original line number Diff line number Diff line
@@ -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)