Commit 06ed2289 authored by Johannes Weiner's avatar Johannes Weiner Committed by Andrew Morton
Browse files

mm: zswap: simplify zswap_invalidate() 

The branching is awkward and duplicates code. The comment about
writeback is also misleading: yes, the entry might have been written
back. Or it might have never been stored in zswap to begin with due to
a rejection - zswap_invalidate() is called on all exiting swap entries.

Link: https://lkml.kernel.org/r/20240130014208.565554-10-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 be7fc97c

mm/zswap.c

+2 −7
Original line number Diff line number Diff line
@@ -1739,14 +1739,9 @@ void zswap_invalidate(int type, pgoff_t offset) 
	struct zswap_tree *tree = swap_zswap_tree(swp_entry(type, offset));

	struct zswap_entry *entry;



	/* find */

	spin_lock(&tree->lock);

	entry = zswap_rb_search(&tree->rbroot, offset);

	if (!entry) {

		/* entry was written back */

		spin_unlock(&tree->lock);

		return;

	}

	if (entry)

		zswap_invalidate_entry(tree, entry);

	spin_unlock(&tree->lock);

}