lkml.org 
[lkml]   [2007]   [May]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 1/4] ext2: remove inode constructor
    From: Pekka Enberg <penberg@cs.helsinki.fi>

    As alloc_inode() touches the same cache line as init_once(), we gain
    nothing from using slab constructors.

    Cc: Stephen C. Tweedie <sct@redhat.com>
    Cc: Andreas Dilger <adilger@clusterfs.com>
    Cc: Christoph Lameter <clameter@sgi.com>
    Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
    ---
    fs/ext2/super.c | 32 +++++++++++++-------------------
    1 file changed, 13 insertions(+), 19 deletions(-)

    Index: 26-mm/fs/ext2/super.c
    ===================================================================
    --- 26-mm.orig/fs/ext2/super.c 2007-05-05 12:26:15.000000000 +0300
    +++ 26-mm/fs/ext2/super.c 2007-05-05 12:30:50.000000000 +0300
    @@ -140,16 +140,24 @@ static struct kmem_cache * ext2_inode_ca
    static struct inode *ext2_alloc_inode(struct super_block *sb)
    {
    struct ext2_inode_info *ei;
    - ei = (struct ext2_inode_info *)kmem_cache_alloc(ext2_inode_cachep,
    - GFP_KERNEL|__GFP_RECLAIMABLE);
    + struct inode *inode;
    +
    + ei = kmem_cache_alloc(ext2_inode_cachep, GFP_KERNEL|__GFP_RECLAIMABLE);
    if (!ei)
    return NULL;
    + rwlock_init(&ei->i_meta_lock);
    +#ifdef CONFIG_EXT2_FS_XATTR
    + init_rwsem(&ei->xattr_sem);
    +#endif
    + mutex_init(&ei->truncate_mutex);
    #ifdef CONFIG_EXT2_FS_POSIX_ACL
    ei->i_acl = EXT2_ACL_NOT_CACHED;
    ei->i_default_acl = EXT2_ACL_NOT_CACHED;
    #endif
    - ei->vfs_inode.i_version = 1;
    - return &ei->vfs_inode;
    + inode = &ei->vfs_inode;
    + inode_init_once(inode);
    + inode->i_version = 1;
    + return inode;
    }

    static void ext2_destroy_inode(struct inode *inode)
    @@ -157,27 +165,13 @@ static void ext2_destroy_inode(struct in
    kmem_cache_free(ext2_inode_cachep, EXT2_I(inode));
    }

    -static void init_once(void * foo, struct kmem_cache * cachep, unsigned long flags)
    -{
    - struct ext2_inode_info *ei = (struct ext2_inode_info *) foo;
    -
    - if (flags & SLAB_CTOR_CONSTRUCTOR) {
    - rwlock_init(&ei->i_meta_lock);
    -#ifdef CONFIG_EXT2_FS_XATTR
    - init_rwsem(&ei->xattr_sem);
    -#endif
    - mutex_init(&ei->truncate_mutex);
    - inode_init_once(&ei->vfs_inode);
    - }
    -}
    -
    static int init_inodecache(void)
    {
    ext2_inode_cachep = kmem_cache_create("ext2_inode_cache",
    sizeof(struct ext2_inode_info),
    0, (SLAB_RECLAIM_ACCOUNT|
    SLAB_MEM_SPREAD),
    - init_once, NULL);
    + NULL, NULL);
    if (ext2_inode_cachep == NULL)
    return -ENOMEM;
    return 0;
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2007-05-05 18:11    [W:0.021 / U:154.540 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site