Commit d8ad47d8 authored by Geliang Tang's avatar Geliang Tang Committed by Linus Torvalds

mm/slab.c use list_first_entry_or_null()

Simplify the code with list_first_entry_or_null().
Signed-off-by: default avatarGeliang Tang <geliangtang@163.com>
Acked-by: default avatarChristoph Lameter <cl@linux.com>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: David Rientjes <rientjes@google.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 2bd03e49
...@@ -2791,18 +2791,18 @@ static void *cache_alloc_refill(struct kmem_cache *cachep, gfp_t flags, ...@@ -2791,18 +2791,18 @@ static void *cache_alloc_refill(struct kmem_cache *cachep, gfp_t flags,
} }
while (batchcount > 0) { while (batchcount > 0) {
struct list_head *entry;
struct page *page; struct page *page;
/* Get slab alloc is to come from. */ /* Get slab alloc is to come from. */
entry = n->slabs_partial.next; page = list_first_entry_or_null(&n->slabs_partial,
if (entry == &n->slabs_partial) { struct page, lru);
if (!page) {
n->free_touched = 1; n->free_touched = 1;
entry = n->slabs_free.next; page = list_first_entry_or_null(&n->slabs_free,
if (entry == &n->slabs_free) struct page, lru);
if (!page)
goto must_grow; goto must_grow;
} }
page = list_entry(entry, struct page, lru);
check_spinlock_acquired(cachep); check_spinlock_acquired(cachep);
/* /*
...@@ -3085,7 +3085,6 @@ static void *fallback_alloc(struct kmem_cache *cache, gfp_t flags) ...@@ -3085,7 +3085,6 @@ static void *fallback_alloc(struct kmem_cache *cache, gfp_t flags)
static void *____cache_alloc_node(struct kmem_cache *cachep, gfp_t flags, static void *____cache_alloc_node(struct kmem_cache *cachep, gfp_t flags,
int nodeid) int nodeid)
{ {
struct list_head *entry;
struct page *page; struct page *page;
struct kmem_cache_node *n; struct kmem_cache_node *n;
void *obj; void *obj;
...@@ -3098,15 +3097,16 @@ static void *____cache_alloc_node(struct kmem_cache *cachep, gfp_t flags, ...@@ -3098,15 +3097,16 @@ static void *____cache_alloc_node(struct kmem_cache *cachep, gfp_t flags,
retry: retry:
check_irq_off(); check_irq_off();
spin_lock(&n->list_lock); spin_lock(&n->list_lock);
entry = n->slabs_partial.next; page = list_first_entry_or_null(&n->slabs_partial,
if (entry == &n->slabs_partial) { struct page, lru);
if (!page) {
n->free_touched = 1; n->free_touched = 1;
entry = n->slabs_free.next; page = list_first_entry_or_null(&n->slabs_free,
if (entry == &n->slabs_free) struct page, lru);
if (!page)
goto must_grow; goto must_grow;
} }
page = list_entry(entry, struct page, lru);
check_spinlock_acquired_node(cachep, nodeid); check_spinlock_acquired_node(cachep, nodeid);
STATS_INC_NODEALLOCS(cachep); STATS_INC_NODEALLOCS(cachep);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment