[Patch v2] mm/swap_slots.c: assign|reset cache slot by value directly

[Patch v2] mm/swap_slots.c: assign|reset cache slot by value directly

[Wei Yang]

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>
CC: Tim Chen <tim.c.chen@linux.intel.com>

---
v2: keep the reset step after use, but remove the tmp pointer
---
 mm/swap_slots.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/mm/swap_slots.c b/mm/swap_slots.c
index 63a7b4563a57..0975adc72253 100644
--- a/mm/swap_slots.c
+++ b/mm/swap_slots.c
@@ -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,13 +336,11 @@ 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))
-					goto repeat;
+			} else if (refill_swap_slots_cache(cache)) {
+				goto repeat;
 			}
 		}
 		mutex_unlock(&cache->alloc_lock);
-- 
2.20.1 (Apple Git-117)

Re: [Patch v2] mm/swap_slots.c: assign|reset cache slot by value directly

[Tim Chen]

On 3/10/20 10:53 PM, Wei Yang wrote:
> 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>
> CC: Tim Chen <tim.c.chen@linux.intel.com>

Acked-by: Tim Chen <tim.c.chen@linux.intel.com>

> 
> ---
> v2: keep the reset step after use, but remove the tmp pointer
> ---