Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1281921

[PATCH 1/3] mm/slab: use list_first_entry_or_null()

Show all headers | View raw

Simplify the code with list_first_entry_or_null().

Signed-off-by: Geliang Tang <geliangtang@163.com>
---
 mm/slab.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/mm/slab.c b/mm/slab.c
index 4765c97..6bb0466 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -2791,18 +2791,18 @@ retry:
 	}
 
 	while (batchcount > 0) {
-		struct list_head *entry;
 		struct page *page;
 		/* Get slab alloc is to come from. */
-		entry = n->slabs_partial.next;
-		if (entry == &n->slabs_partial) {
+		page = list_first_entry_or_null(&n->slabs_partial,
+				struct page, lru);
+		if (!page) {
 			n->free_touched = 1;
-			entry = n->slabs_free.next;
-			if (entry == &n->slabs_free)
+			page = list_first_entry_or_null(&n->slabs_free,
+					struct page, lru);
+			if (!page)
 				goto must_grow;
 		}
 
-		page = list_entry(entry, struct page, lru);
 		check_spinlock_acquired(cachep);
 
 		/*
@@ -3085,7 +3085,6 @@ retry:
 static void *____cache_alloc_node(struct kmem_cache *cachep, gfp_t flags,
 				int nodeid)
 {
-	struct list_head *entry;
 	struct page *page;
 	struct kmem_cache_node *n;
 	void *obj;
@@ -3098,15 +3097,16 @@ static void *____cache_alloc_node(struct kmem_cache *cachep, gfp_t flags,
 retry:
 	check_irq_off();
 	spin_lock(&n->list_lock);
-	entry = n->slabs_partial.next;
-	if (entry == &n->slabs_partial) {
+	page = list_first_entry_or_null(&n->slabs_partial,
+			struct page, lru);
+	if (!page) {
 		n->free_touched = 1;
-		entry = n->slabs_free.next;
-		if (entry == &n->slabs_free)
+		page = list_first_entry_or_null(&n->slabs_free,
+				struct page, lru);
+		if (!page)
 			goto must_grow;
 	}
 
-	page = list_entry(entry, struct page, lru);
 	check_spinlock_acquired_node(cachep, nodeid);
 
 	STATS_INC_NODEALLOCS(cachep);
-- 
2.5.0


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH 1/3] mm/slab: use list_first_entry_or_null() Geliang Tang <geliangtang@163.com> - 2015-12-02 16:50 +0100
  [PATCH 2/3] mm/slab: use list_for_each_entry in cache_flusharray Geliang Tang <geliangtang@163.com> - 2015-12-02 16:50 +0100
    Re: [PATCH 2/3] mm/slab: use list_for_each_entry in  cache_flusharray Christoph Lameter <cl@linux.com> - 2015-12-02 17:00 +0100
  [PATCH 3/3] mm/slab: use list_{empty_careful,last_entry} in drain_freelist Geliang Tang <geliangtang@163.com> - 2015-12-02 16:50 +0100
    Re: [PATCH 3/3] mm/slab: use list_{empty_careful,last_entry} in  drain_freelist Christoph Lameter <cl@linux.com> - 2015-12-02 17:10 +0100
      [PATCH v2] mm/slab.c: use list_{empty_careful,last_entry} in drain_freelist Geliang Tang <geliangtang@163.com> - 2015-12-03 15:10 +0100
        Re: [PATCH v2] mm/slab.c: use list_{empty_careful,last_entry} in  drain_freelist Christoph Lameter <cl@linux.com> - 2015-12-03 16:00 +0100
          Re: [PATCH v2] mm/slab.c: use list_{empty_careful,last_entry} in  drain_freelist Geliang Tang <geliangtang@163.com> - 2015-12-04 14:50 +0100
            Re: [PATCH v2] mm/slab.c: use list_{empty_careful,last_entry} in  drain_freelist Christoph Lameter <cl@linux.com> - 2015-12-04 17:20 +0100
              Re: [PATCH v2] mm/slab.c: use list_{empty_careful,last_entry} in  drain_freelist Geliang Tang <geliangtang@163.com> - 2015-12-05 03:40 +0100
  Re: [PATCH 1/3] mm/slab: use list_first_entry_or_null() Christoph Lameter <cl@linux.com> - 2015-12-02 17:00 +0100

csiph-web