The patch titled
Subject: mm/slab.c use list_first_entry_or_null()
has been removed from the -mm tree. Its filename was
mm-slab-use-list_first_entry_or_null.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Geliang Tang <geliangtang@xxxxxxx>
Subject: mm/slab.c use list_first_entry_or_null()
Simplify the code with list_first_entry_or_null().
Signed-off-by: Geliang Tang <geliangtang@xxxxxxx>
Acked-by: Christoph Lameter <cl@xxxxxxxxx>
Cc: Pekka Enberg <penberg@xxxxxxxxxx>
Cc: David Rientjes <rientjes@xxxxxxxxxx>
Cc: Joonsoo Kim <iamjoonsoo.kim@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/slab.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff -puN mm/slab.c~mm-slab-use-list_first_entry_or_null mm/slab.c
--- a/mm/slab.c~mm-slab-use-list_first_entry_or_null
+++ a/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
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);
_
Patches currently in -mm which might be from geliangtang@xxxxxxx are
mm-swapfilec-use-list_for_each_entry_safe-in-free_swap_count_continuations.patch
mm-move-lru_to_page-to-mm_inlineh.patch
mm-zbud-use-list_last_entry-instead-of-list_tail_entry.patch
hfs-use-list_for_each_entry-in-hfs_cat_delete.patch
kexec-use-list_for_each_entry_safe-in-kimage_free_page_list.patch
rapidio-use-kobj_to_dev.patch
dma-mapping-use-offset_in_page-macro.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
