Prev: [S+Q3 23/23] vmscan: Tie slub object expiration into page reclaim
Next: [S+Q3 18/23] slub: Drop allocator announcement
From: Christoph Lameter on 3 Aug 2010 23:00
count_free() == available()

Signed-off-by: Christoph Lameter <cl(a)linux-foundation.org>

---
mm/slub.c | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)

Index: linux-2.6/mm/slub.c
===================================================================
--- linux-2.6.orig/mm/slub.c 2010-07-30 18:44:54.767739966 -0500
+++ linux-2.6/mm/slub.c 2010-07-30 18:45:24.248349179 -0500
@@ -1697,11 +1697,6 @@
return 1;
}

-static int count_free(struct page *page)
-{
- return available(page);
-}
-
static unsigned long count_partial(struct kmem_cache_node *n,
int (*get_count)(struct page *))
{
@@ -1750,7 +1745,7 @@
if (!n)
continue;

- nr_free = count_partial(n, count_free);
+ nr_free = count_partial(n, available);
nr_slabs = node_nr_slabs(n);
nr_objs = node_nr_objs(n);

@@ -3906,7 +3901,7 @@
x = atomic_long_read(&n->total_objects);
else if (flags & SO_OBJECTS)
x = atomic_long_read(&n->total_objects) -
- count_partial(n, count_free);
+ count_partial(n, available);

else
x = atomic_long_read(&n->nr_slabs);
@@ -4792,7 +4787,7 @@
nr_partials += n->nr_partial;
nr_slabs += atomic_long_read(&n->nr_slabs);
nr_objs += atomic_long_read(&n->total_objects);
- nr_free += count_partial(n, count_free);
+ nr_free += count_partial(n, available);
}

nr_inuse = nr_objs - nr_free;

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [S+Q3 23/23] vmscan: Tie slub object expiration into page reclaim
Next: [S+Q3 18/23] slub: Drop allocator announcement