Commit 2406b76f authored Apr 01, 2020 by Wei Yang Committed by Linus Torvalds Apr 02, 2020

mm/swap_slots.c: assign|reset cache slot by value directly

Currently we use a tmp pointer, pentry, to transfer and reset swap cache
slot, which is a little redundant. Swap cache slot stores the entry value
directly, assign and reset it by value would be straight forward.

Also this patch merges the else and if, since this is the only case we
refill and repeat swap cache.

Signed-off-by: Wei Yang <richard.weiyang@linux.alibaba.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Acked-by: Tim Chen <tim.c.chen@linux.intel.com>
Link: http://lkml.kernel.org/r/20200311055352.50574-1-richard.weiyang@linux.alibaba.com

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 21820948

mm/swap_slots.c

+5 −7

Original line number	Diff line number	Diff line
		@@ -309,7 +309,7 @@ int free_swap_slot(swp_entry_t entry)

		swp_entry_t get_swap_page(struct page *page)
		{
		swp_entry_t entry, *pentry;
		swp_entry_t entry;
		struct swap_slots_cache *cache;

		entry.val = 0;
		@@ -336,12 +336,10 @@ swp_entry_t get_swap_page(struct page *page)
		if (cache->slots) {
		repeat:
		if (cache->nr) {
		pentry = &cache->slots[cache->cur++];
		entry = *pentry;
		pentry->val = 0;
		entry = cache->slots[cache->cur];
		cache->slots[cache->cur++].val = 0;
		cache->nr--;
		} else {
		if (refill_swap_slots_cache(cache))
		} else if (refill_swap_slots_cache(cache)) {
		goto repeat;
		}
		}