From: Christoph Lameter Subject: [patch 02/19] slub: Replace ctor field with ops field in /sys/slab/* Date: Fri, 09 May 2008 19:21:03 -0700 Message-ID: <20080801182344.316421894@lameter.com> References: <20080801182324.572058187@lameter.com> Cc: akpm@linux-foundation.org, Christoph Lameter , Christoph Lameter To: Pekka Enberg Return-path: Received: from nlpi053.sbcis.sbc.com ([207.115.36.82]:3716 "EHLO nlpi053.prodigy.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752296AbYHAScG (ORCPT ); Fri, 1 Aug 2008 14:32:06 -0400 Cc: linux-kernel@vger.kernel.org CC: linux-fsdevel@vger.kernel.org Cc: Mel Gorman Cc: andi@firstfloor.org Cc: Rik van Riel Cc: mpm@selenic.com Cc: Dave Chinner Content-Disposition: inline; filename=0002-SLUB-Replace-ctor-field-with-ops-field-in-sys-slab.patch Sender: linux-fsdevel-owner@vger.kernel.org List-ID: Create an ops field in /sys/slab/*/ops to contain all the operations defined on a slab. This will be used to display the additional operations that will be defined soon. Reviewed-by: Rik van Riel Signed-off-by: Christoph Lameter Signed-off-by: Pekka Enberg Signed-off-by: Christoph Lameter --- mm/slub.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) Index: linux-2.6/mm/slub.c =================================================================== --- linux-2.6.orig/mm/slub.c 2008-07-31 12:19:28.000000000 -0500 +++ linux-2.6/mm/slub.c 2008-07-31 12:19:51.000000000 -0500 @@ -3803,16 +3803,18 @@ } SLAB_ATTR(order); -static ssize_t ctor_show(struct kmem_cache *s, char *buf) +static ssize_t ops_show(struct kmem_cache *s, char *buf) { - if (s->ctor) { - int n = sprint_symbol(buf, (unsigned long)s->ctor); + int x = 0; - return n + sprintf(buf + n, "\n"); + if (s->ctor) { + x += sprintf(buf + x, "ctor : "); + x += sprint_symbol(buf + x, (unsigned long)s->ctor); + x += sprintf(buf + x, "\n"); } - return 0; + return x; } -SLAB_ATTR_RO(ctor); +SLAB_ATTR_RO(ops); static ssize_t aliases_show(struct kmem_cache *s, char *buf) { @@ -4145,7 +4147,7 @@ &slabs_attr.attr, &partial_attr.attr, &cpu_slabs_attr.attr, - &ctor_attr.attr, + &ops_attr.attr, &aliases_attr.attr, &align_attr.attr, &sanity_checks_attr.attr, --