mirror of
https://github.com/torvalds/linux.git
synced 2024-12-27 05:11:48 +00:00
mm/slab: factor out slab list fixup code
Slab list should be fixed up after object is detached from the slab and this happens at two places. They do exactly same thing. They will be changed in the following patch, so, to reduce code duplication, this patch factor out them and make it common function. Signed-off-by: Joonsoo Kim <iamjoonsoo.kim@lge.com> Cc: Christoph Lameter <cl@linux.com> Cc: Pekka Enberg <penberg@kernel.org> Cc: David Rientjes <rientjes@google.com> Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com> Cc: Jesper Dangaard Brouer <brouer@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
3217fd9bdf
commit
d8410234db
25
mm/slab.c
25
mm/slab.c
@ -2723,6 +2723,17 @@ static void *cache_free_debugcheck(struct kmem_cache *cachep, void *objp,
|
||||
#define cache_free_debugcheck(x,objp,z) (objp)
|
||||
#endif
|
||||
|
||||
static inline void fixup_slab_list(struct kmem_cache *cachep,
|
||||
struct kmem_cache_node *n, struct page *page)
|
||||
{
|
||||
/* move slabp to correct slabp list: */
|
||||
list_del(&page->lru);
|
||||
if (page->active == cachep->num)
|
||||
list_add(&page->lru, &n->slabs_full);
|
||||
else
|
||||
list_add(&page->lru, &n->slabs_partial);
|
||||
}
|
||||
|
||||
static struct page *get_first_slab(struct kmem_cache_node *n)
|
||||
{
|
||||
struct page *page;
|
||||
@ -2796,12 +2807,7 @@ retry:
|
||||
ac_put_obj(cachep, ac, slab_get_obj(cachep, page));
|
||||
}
|
||||
|
||||
/* move slabp to correct slabp list: */
|
||||
list_del(&page->lru);
|
||||
if (page->active == cachep->num)
|
||||
list_add(&page->lru, &n->slabs_full);
|
||||
else
|
||||
list_add(&page->lru, &n->slabs_partial);
|
||||
fixup_slab_list(cachep, n, page);
|
||||
}
|
||||
|
||||
must_grow:
|
||||
@ -3067,13 +3073,8 @@ retry:
|
||||
|
||||
obj = slab_get_obj(cachep, page);
|
||||
n->free_objects--;
|
||||
/* move slabp to correct slabp list: */
|
||||
list_del(&page->lru);
|
||||
|
||||
if (page->active == cachep->num)
|
||||
list_add(&page->lru, &n->slabs_full);
|
||||
else
|
||||
list_add(&page->lru, &n->slabs_partial);
|
||||
fixup_slab_list(cachep, n, page);
|
||||
|
||||
spin_unlock(&n->list_lock);
|
||||
goto done;
|
||||
|
Loading…
Reference in New Issue
Block a user