From: Vlastimil Babka <vbabka@suse.cz>
Date: Mon, 1 Nov 2021 16:02:30 +0000 (+0100)
Subject: mm/slab: Dissolve slab_map_pages() in its caller
X-Git-Tag: v6.1-rc5~2189^2~32
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c798154311e10ddba56a515c8ddce14e592bbe25;hp=7d4203c13435c0bdae61bf16bbd0408d5b958ade;p=platform%2Fkernel%2Flinux-starfive.git

mm/slab: Dissolve slab_map_pages() in its caller

The function no longer does what its name and comment suggests, and just
sets two struct page fields, which can be done directly in its sole
caller.

Signed-off-by: Vlastimil Babka <vbabka@suse.cz>
Reviewed-by: Roman Gushchin <guro@fb.com>
Reviewed-by: Hyeonggon Yoo <42.hyeyoo@gmail.com>
---

diff --git a/mm/slab.c b/mm/slab.c
index ca4822f..381875e 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -2547,18 +2547,6 @@ static void slab_put_obj(struct kmem_cache *cachep,
 }
 
 /*
- * Map pages beginning at addr to the given cache and slab. This is required
- * for the slab allocator to be able to lookup the cache and slab of a
- * virtual address for kfree, ksize, and slab debugging.
- */
-static void slab_map_pages(struct kmem_cache *cache, struct page *page,
-			   void *freelist)
-{
-	page->slab_cache = cache;
-	page->freelist = freelist;
-}
-
-/*
  * Grow (by 1) the number of slabs within a cache.  This is called by
  * kmem_cache_alloc() when there are no active objs left in a cache.
  */
@@ -2621,7 +2609,8 @@ static struct page *cache_grow_begin(struct kmem_cache *cachep,
 	if (OFF_SLAB(cachep) && !freelist)
 		goto opps1;
 
-	slab_map_pages(cachep, page, freelist);
+	page->slab_cache = cachep;
+	page->freelist = freelist;
 
 	cache_init_objs(cachep, page);