|
@@ -2554,7 +2554,7 @@ static void __slab_free(struct kmem_cache *s, struct page *page,
|
|
|
|
|
|
} else { /* Needs to be taken off a list */
|
|
} else { /* Needs to be taken off a list */
|
|
|
|
|
|
- n = get_node(s, page_to_nid(page));
|
|
|
|
|
|
+ n = get_node(s, page_to_nid(page));
|
|
/*
|
|
/*
|
|
* Speculatively acquire the list_lock.
|
|
* Speculatively acquire the list_lock.
|
|
* If the cmpxchg does not succeed then we may
|
|
* If the cmpxchg does not succeed then we may
|
|
@@ -2587,10 +2587,10 @@ static void __slab_free(struct kmem_cache *s, struct page *page,
|
|
* The list lock was not taken therefore no list
|
|
* The list lock was not taken therefore no list
|
|
* activity can be necessary.
|
|
* activity can be necessary.
|
|
*/
|
|
*/
|
|
- if (was_frozen)
|
|
|
|
- stat(s, FREE_FROZEN);
|
|
|
|
- return;
|
|
|
|
- }
|
|
|
|
|
|
+ if (was_frozen)
|
|
|
|
+ stat(s, FREE_FROZEN);
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
|
|
if (unlikely(!new.inuse && n->nr_partial >= s->min_partial))
|
|
if (unlikely(!new.inuse && n->nr_partial >= s->min_partial))
|
|
goto slab_empty;
|
|
goto slab_empty;
|