Commit 7dd1f7f0 authored by Johannes Weiner's avatar Johannes Weiner Committed by Andrew Morton
Browse files

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: 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 5b297f70

mm/zswap.c

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

{