mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

mm: zswap: move zswap_invalidate_entry() to related functions 

Move it up to the other tree and refcounting functions.

Link: https://lkml.kernel.org/r/20240130014208.565554-4-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>
This commit is contained in:
Johannes Weiner 2024-01-29 20:36:39 -05:00 committed by Andrew Morton
parent 5b297f70bb
commit 7dd1f7f0fc
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
mm/zswap.c
View File

@ -558,6 +558,18 @@ static void zswap_entry_put(struct zswap_entry *entry)
}
}
/*
* If the entry is still valid in the tree, drop the initial ref and remove it
* from the tree. This function must be called with an additional ref held,
* otherwise it may race with another invalidation freeing the entry.
*/
static void zswap_invalidate_entry(struct zswap_tree *tree,
struct zswap_entry *entry)
{
if (zswap_rb_erase(&tree->rbroot, entry))
zswap_entry_put(entry);
}
/*********************************
* shrinker functions
**********************************/
@ -808,18 +820,6 @@ static struct zswap_pool *zswap_pool_find_get(char *type, char *compressor)
return NULL;
}
/*
* If the entry is still valid in the tree, drop the initial ref and remove it
* from the tree. This function must be called with an additional ref held,
* otherwise it may race with another invalidation freeing the entry.
*/
static void zswap_invalidate_entry(struct zswap_tree *tree,
struct zswap_entry *entry)
{
if (zswap_rb_erase(&tree->rbroot, entry))
zswap_entry_put(entry);
}
static enum lru_status shrink_memcg_cb(struct list_head *item, struct list_lru_one *l,
spinlock_t *lock, void *arg)
{