Commit db128f5f authored by Yosry Ahmed's avatar Yosry Ahmed Committed by Andrew Morton

mm: zswap: remove unused tree argument in zswap_entry_put()

Commit 73108957 ("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.comSigned-off-by: default avatarYosry Ahmed <yosryahmed@google.com>
Reviewed-by: default avatarChengming Zhou <zhouchengming@bytedance.com>
Acked-by: default avatarJohannes Weiner <hannes@cmpxchg.org>
Reviewed-by: default avatarNhat Pham <nphamcs@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 412c6ef9
...@@ -568,8 +568,7 @@ static void zswap_entry_get(struct zswap_entry *entry) ...@@ -568,8 +568,7 @@ static void zswap_entry_get(struct zswap_entry *entry)
/* caller must hold the tree lock /* caller must hold the tree lock
* remove from the tree and free it, if nobody reference the entry * remove from the tree and free it, if nobody reference the entry
*/ */
static void zswap_entry_put(struct zswap_tree *tree, static void zswap_entry_put(struct zswap_entry *entry)
struct zswap_entry *entry)
{ {
int refcount = --entry->refcount; int refcount = --entry->refcount;
...@@ -852,7 +851,7 @@ static void zswap_invalidate_entry(struct zswap_tree *tree, ...@@ -852,7 +851,7 @@ static void zswap_invalidate_entry(struct zswap_tree *tree,
struct zswap_entry *entry) struct zswap_entry *entry)
{ {
if (zswap_rb_erase(&tree->rbroot, 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, 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(struct list_head *item, struct list_lru_o ...@@ -921,7 +920,7 @@ static enum lru_status shrink_memcg_cb(struct list_head *item, struct list_lru_o
put_unlock: put_unlock:
/* Drop local reference */ /* Drop local reference */
zswap_entry_put(tree, entry); zswap_entry_put(entry);
unlock: unlock:
spin_unlock(&tree->lock); spin_unlock(&tree->lock);
spin_lock(lock); spin_lock(lock);
...@@ -1754,7 +1753,7 @@ bool zswap_load(struct folio *folio) ...@@ -1754,7 +1753,7 @@ bool zswap_load(struct folio *folio)
zswap_lru_del(&entry->pool->list_lru, entry); zswap_lru_del(&entry->pool->list_lru, entry);
zswap_lru_add(&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); spin_unlock(&tree->lock);
return true; return true;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment