From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757602AbYHYVYv (ORCPT ); Mon, 25 Aug 2008 17:24:51 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754465AbYHYVYQ (ORCPT ); Mon, 25 Aug 2008 17:24:16 -0400 Received: from nlpi025.sbcis.sbc.com ([207.115.36.54]:17206 "EHLO nlpi025.prodigy.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754225AbYHYVYP (ORCPT ); Mon, 25 Aug 2008 17:24:15 -0400 Message-Id: <20080825212053.500920055@quilx.com> References: <20080825212035.861870487@quilx.com> User-Agent: quilt/0.46-1 Date: Mon, 25 Aug 2008 14:20:37 -0700 From: Christoph Lameter To: Pekka Enberg CC: akpm@linux-foundation.org, Alexander Viro , Christoph Hellwig , Christoph Lameter , Christoph Lameter 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 Subject: [patch 2/3] dentries: Add constructor Content-Disposition: inline; filename=0031-dentries-Add-constructor.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In order to support defragmentation on the dentry cache we need to have a determined object state at all times. Without a constructor the object would have a random state after allocation. So provide a constructor. Cc: Alexander Viro Cc: Christoph Hellwig Reviewed-by: Rik van Riel Signed-off-by: Christoph Lameter Signed-off-by: Christoph Lameter --- fs/dcache.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) Index: linux-next/fs/dcache.c =================================================================== --- linux-next.orig/fs/dcache.c 2008-08-25 15:54:27.000000000 -0500 +++ linux-next/fs/dcache.c 2008-08-25 15:55:10.000000000 -0500 @@ -890,6 +890,16 @@ .seeks = DEFAULT_SEEKS, }; +static void dcache_ctor(void *p) +{ + struct dentry *dentry = p; + + spin_lock_init(&dentry->d_lock); + dentry->d_inode = NULL; + INIT_LIST_HEAD(&dentry->d_lru); + INIT_LIST_HEAD(&dentry->d_alias); +} + /** * d_alloc - allocate a dcache entry * @parent: parent of entry to allocate @@ -927,8 +937,6 @@ atomic_set(&dentry->d_count, 1); dentry->d_flags = DCACHE_UNHASHED; - spin_lock_init(&dentry->d_lock); - dentry->d_inode = NULL; dentry->d_parent = NULL; dentry->d_sb = NULL; dentry->d_op = NULL; @@ -938,9 +946,7 @@ dentry->d_cookie = NULL; #endif INIT_HLIST_NODE(&dentry->d_hash); - INIT_LIST_HEAD(&dentry->d_lru); INIT_LIST_HEAD(&dentry->d_subdirs); - INIT_LIST_HEAD(&dentry->d_alias); if (parent) { dentry->d_parent = dget(parent); @@ -2268,14 +2274,10 @@ { int loop; - /* - * A constructor could be added for stable state like the lists, - * but it is probably not worth it because of the cache nature - * of the dcache. - */ - dentry_cache = KMEM_CACHE(dentry, - SLAB_RECLAIM_ACCOUNT|SLAB_PANIC|SLAB_MEM_SPREAD); - + dentry_cache = kmem_cache_create("dentry_cache", sizeof(struct dentry), + 0, SLAB_RECLAIM_ACCOUNT|SLAB_PANIC|SLAB_MEM_SPREAD, + dcache_ctor); + register_shrinker(&dcache_shrinker); /* Hash may have been set up in dcache_init_early */ --