|
@@ -1180,6 +1180,12 @@ static int init_cache_node_node(int node)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
+static inline int slabs_tofree(struct kmem_cache *cachep,
|
|
|
+ struct kmem_cache_node *n)
|
|
|
+{
|
|
|
+ return (n->free_objects + cachep->num - 1) / cachep->num;
|
|
|
+}
|
|
|
+
|
|
|
static void __cpuinit cpuup_canceled(long cpu)
|
|
|
{
|
|
|
struct kmem_cache *cachep;
|
|
@@ -1241,7 +1247,7 @@ free_array_cache:
|
|
|
n = cachep->node[node];
|
|
|
if (!n)
|
|
|
continue;
|
|
|
- drain_freelist(cachep, n, n->free_objects);
|
|
|
+ drain_freelist(cachep, n, slabs_tofree(cachep, n));
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -1408,7 +1414,7 @@ static int __meminit drain_cache_node_node(int node)
|
|
|
if (!n)
|
|
|
continue;
|
|
|
|
|
|
- drain_freelist(cachep, n, n->free_objects);
|
|
|
+ drain_freelist(cachep, n, slabs_tofree(cachep, n));
|
|
|
|
|
|
if (!list_empty(&n->slabs_full) ||
|
|
|
!list_empty(&n->slabs_partial)) {
|
|
@@ -2534,7 +2540,7 @@ static int __cache_shrink(struct kmem_cache *cachep)
|
|
|
if (!n)
|
|
|
continue;
|
|
|
|
|
|
- drain_freelist(cachep, n, n->free_objects);
|
|
|
+ drain_freelist(cachep, n, slabs_tofree(cachep, n));
|
|
|
|
|
|
ret += !list_empty(&n->slabs_full) ||
|
|
|
!list_empty(&n->slabs_partial);
|