mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 03:01:39 -04:00
mm: slab/slub: use page->list consistently instead of page->lru
'struct page' has two list_head fields: 'lru' and 'list'. Conveniently, they are unioned together. This means that code can use them interchangably, which gets horribly confusing like with this nugget from slab.c: > list_del(&page->lru); > if (page->active == cachep->num) > list_add(&page->list, &n->slabs_full); This patch makes the slab and slub code use page->lru universally instead of mixing ->list and ->lru. So, the new rule is: page->lru is what the you use if you want to keep your page on a list. Don't like the fact that it's not called ->list? Too bad. Signed-off-by: Dave Hansen <[email protected]> Acked-by: Christoph Lameter <[email protected]> Acked-by: David Rientjes <[email protected]> Cc: Pekka Enberg <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Pekka Enberg <[email protected]>
This commit is contained in:
parent
5f0985bb11
commit
34bf6ef94a
3 changed files with 9 additions and 8 deletions
|
|
@ -2922,9 +2922,9 @@ retry:
|
|||
/* move slabp to correct slabp list: */
|
||||
list_del(&page->lru);
|
||||
if (page->active == cachep->num)
|
||||
list_add(&page->list, &n->slabs_full);
|
||||
list_add(&page->lru, &n->slabs_full);
|
||||
else
|
||||
list_add(&page->list, &n->slabs_partial);
|
||||
list_add(&page->lru, &n->slabs_partial);
|
||||
}
|
||||
|
||||
must_grow:
|
||||
|
|
|
|||
10
mm/slob.c
10
mm/slob.c
|
|
@ -111,13 +111,13 @@ static inline int slob_page_free(struct page *sp)
|
|||
|
||||
static void set_slob_page_free(struct page *sp, struct list_head *list)
|
||||
{
|
||||
list_add(&sp->list, list);
|
||||
list_add(&sp->lru, list);
|
||||
__SetPageSlobFree(sp);
|
||||
}
|
||||
|
||||
static inline void clear_slob_page_free(struct page *sp)
|
||||
{
|
||||
list_del(&sp->list);
|
||||
list_del(&sp->lru);
|
||||
__ClearPageSlobFree(sp);
|
||||
}
|
||||
|
||||
|
|
@ -282,7 +282,7 @@ static void *slob_alloc(size_t size, gfp_t gfp, int align, int node)
|
|||
|
||||
spin_lock_irqsave(&slob_lock, flags);
|
||||
/* Iterate through each partially free page, try to find room */
|
||||
list_for_each_entry(sp, slob_list, list) {
|
||||
list_for_each_entry(sp, slob_list, lru) {
|
||||
#ifdef CONFIG_NUMA
|
||||
/*
|
||||
* If there's a node specification, search for a partial
|
||||
|
|
@ -296,7 +296,7 @@ static void *slob_alloc(size_t size, gfp_t gfp, int align, int node)
|
|||
continue;
|
||||
|
||||
/* Attempt to alloc */
|
||||
prev = sp->list.prev;
|
||||
prev = sp->lru.prev;
|
||||
b = slob_page_alloc(sp, size, align);
|
||||
if (!b)
|
||||
continue;
|
||||
|
|
@ -322,7 +322,7 @@ static void *slob_alloc(size_t size, gfp_t gfp, int align, int node)
|
|||
spin_lock_irqsave(&slob_lock, flags);
|
||||
sp->units = SLOB_UNITS(PAGE_SIZE);
|
||||
sp->freelist = b;
|
||||
INIT_LIST_HEAD(&sp->list);
|
||||
INIT_LIST_HEAD(&sp->lru);
|
||||
set_slob(b, SLOB_UNITS(PAGE_SIZE), b + SLOB_UNITS(PAGE_SIZE));
|
||||
set_slob_page_free(sp, slob_list);
|
||||
b = slob_page_alloc(sp, size, align);
|
||||
|
|
|
|||
Loading…
Reference in a new issue