Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932940AbbLBPrz (ORCPT ); Wed, 2 Dec 2015 10:47:55 -0500 Received: from m50-135.163.com ([123.125.50.135]:52791 "EHLO m50-135.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932895AbbLBPru (ORCPT ); Wed, 2 Dec 2015 10:47:50 -0500 From: Geliang Tang To: Christoph Lameter , Pekka Enberg , David Rientjes , Joonsoo Kim , Andrew Morton Cc: Geliang Tang , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/3] mm/slab: use list_{empty_careful,last_entry} in drain_freelist Date: Wed, 2 Dec 2015 23:46:13 +0800 Message-Id: <670c0018e0e4f44d6e788423b35e2c32ccf6c1e2.1449070964.git.geliangtang@163.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <7e551749f5a50cef15a33320d6d33b9d0b0986bd.1449070964.git.geliangtang@163.com> References: <7e551749f5a50cef15a33320d6d33b9d0b0986bd.1449070964.git.geliangtang@163.com> In-Reply-To: <22e322cb81d99e70674e9f833c5b6aa4e87714c6.1449070964.git.geliangtang@163.com> References: <7e551749f5a50cef15a33320d6d33b9d0b0986bd.1449070964.git.geliangtang@163.com> <22e322cb81d99e70674e9f833c5b6aa4e87714c6.1449070964.git.geliangtang@163.com> X-CM-TRANSID: D9GowAAX_c5NEl9WPqw8AA--.12360S3 X-Coremail-Antispam: 1Uf129KBjvJXoW7Gw4fGr18uF1rWF4fWrykKrg_yoW8JryUpF s3Cw1xJr48ur4xCF4rCw1q9ryFvFWUKayIgrWjkw18Zr1YvrZ2gF4xA3yxXryrCrW8uwsF vw4vgFW8urWUZ37anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07UweOXUUUUU= X-Originating-IP: [116.77.146.26] X-CM-SenderInfo: 5jhoxtpqjwt0rj6rljoofrz/1tbiJQ7EmVUL8hoeBAAAsa Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1468 Lines: 53 To simplify the code, use list_empty_careful instead of list_empty. To make the intention clearer, use list_last_entry instead of list_entry. Signed-off-by: Geliang Tang --- mm/slab.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/mm/slab.c b/mm/slab.c index 5d5aa3b..1a7d91c 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -2362,21 +2362,14 @@ static void drain_cpu_caches(struct kmem_cache *cachep) static int drain_freelist(struct kmem_cache *cache, struct kmem_cache_node *n, int tofree) { - struct list_head *p; int nr_freed; struct page *page; nr_freed = 0; - while (nr_freed < tofree && !list_empty(&n->slabs_free)) { + while (nr_freed < tofree && !list_empty_careful(&n->slabs_free)) { spin_lock_irq(&n->list_lock); - p = n->slabs_free.prev; - if (p == &n->slabs_free) { - spin_unlock_irq(&n->list_lock); - goto out; - } - - page = list_entry(p, struct page, lru); + page = list_last_entry(&n->slabs_free, struct page, lru); #if DEBUG BUG_ON(page->active); #endif @@ -2390,7 +2383,6 @@ static int drain_freelist(struct kmem_cache *cache, slab_destroy(cache, page); nr_freed++; } -out: return nr_freed; } -- 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/