[PATCH v2] mm/slab.c: use list_{empty_careful,last_entry} in drain_freelist

Geliang Tang
2015-12-03T14:08:43Z

To make the intention clearer, use list_empty_careful and list_last_entry
in drain_freelist().

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

diff --git a/mm/slab.c b/mm/slab.c
index 5d5aa3b..925921e 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -2362,7 +2362,6 @@ 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;

@@ -2370,13 +2369,12 @@ static int drain_freelist(struct kmem_cache *cache,
while (nr_freed < tofree && !list_empty(&n->slabs_free)) {

spin_lock_irq(&n->list_lock);
- p = n->slabs_free.prev;
- if (p == &n->slabs_free) {
+ if (list_empty_careful(&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
--
2.5.0