From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail202.messagelabs.com (mail202.messagelabs.com [216.82.254.227]) by kanga.kvack.org (Postfix) with SMTP id 37EE16004CD for ; Fri, 20 Aug 2010 15:02:39 -0400 (EDT) Message-Id: <20100820190235.573083017@linux.com> Date: Fri, 20 Aug 2010 14:01:54 -0500 From: Christoph Lameter Subject: [S+Q Core 3/6] slub: Get rid of useless function count_free() References: <20100820190151.493325014@linux.com> Content-Disposition: inline; filename=unified_drop_count_free Sender: owner-linux-mm@kvack.org To: Pekka Enberg Cc: linux-mm@kvack.org, David Rientjes List-ID: count_free() == available() Signed-off-by: Christoph Lameter --- 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-08-19 16:34:20.000000000 -0500 +++ linux-2.6/mm/slub.c 2010-08-19 16:34:23.000000000 -0500 @@ -1692,11 +1692,6 @@ static inline int node_match(struct kmem 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 *)) { @@ -1745,7 +1740,7 @@ slab_out_of_memory(struct kmem_cache *s, 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); @@ -3866,7 +3861,7 @@ static ssize_t show_slab_objects(struct 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); @@ -4778,7 +4773,7 @@ static int s_show(struct seq_file *m, vo 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, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org