Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a35afb83 authored by Christoph Lameter's avatar Christoph Lameter Committed by Linus Torvalds
Browse files

Remove SLAB_CTOR_CONSTRUCTOR 



SLAB_CTOR_CONSTRUCTOR is always specified. No point in checking it.

Signed-off-by: default avatarChristoph Lameter <clameter@sgi.com>
Cc: David Howells <dhowells@redhat.com>
Cc: Jens Axboe <jens.axboe@oracle.com>
Cc: Steven French <sfrench@us.ibm.com>
Cc: Michael Halcrow <mhalcrow@us.ibm.com>
Cc: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Cc: Miklos Szeredi <miklos@szeredi.hu>
Cc: Steven Whitehouse <swhiteho@redhat.com>
Cc: Roman Zippel <zippel@linux-m68k.org>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Dave Kleikamp <shaggy@austin.ibm.com>
Cc: Trond Myklebust <trond.myklebust@fys.uio.no>
Cc: "J. Bruce Fields" <bfields@fieldses.org>
Cc: Anton Altaparmakov <aia21@cantab.net>
Cc: Mark Fasheh <mark.fasheh@oracle.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Jan Kara <jack@ucw.cz>
Cc: David Chinner <dgc@sgi.com>
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 5577bd8a

arch/powerpc/platforms/cell/spufs/inode.c

+1 −3
Original line number Diff line number Diff line
@@ -71,10 +71,8 @@ spufs_init_once(void *p, struct kmem_cache * cachep, unsigned long flags) 
{

	struct spufs_inode_info *ei = p;



	if (flags & SLAB_CTOR_CONSTRUCTOR) {

	inode_init_once(&ei->vfs_inode);

}

}



static struct inode *

spufs_new_inode(struct super_block *sb, int mode)

drivers/mtd/ubi/eba.c

+0 −3
Original line number Diff line number Diff line
@@ -940,9 +940,6 @@ static void ltree_entry_ctor(void *obj, struct kmem_cache *cache, 
{

	struct ltree_entry *le = obj;



	if (flags & SLAB_CTOR_CONSTRUCTOR)

		return;



	le->users = 0;

	init_rwsem(&le->mutex);

}

fs/adfs/super.c

+1 −2
Original line number Diff line number Diff line
@@ -232,7 +232,6 @@ static void init_once(void * foo, struct kmem_cache * cachep, unsigned long flag 
{

	struct adfs_inode_info *ei = (struct adfs_inode_info *) foo;



	if (flags & SLAB_CTOR_CONSTRUCTOR)

	inode_init_once(&ei->vfs_inode);

}

fs/affs/super.c

+3 −5
Original line number Diff line number Diff line
@@ -87,12 +87,10 @@ static void init_once(void * foo, struct kmem_cache * cachep, unsigned long flag 
{

	struct affs_inode_info *ei = (struct affs_inode_info *) foo;



	if (flags & SLAB_CTOR_CONSTRUCTOR) {

	init_MUTEX(&ei->i_link_lock);

	init_MUTEX(&ei->i_ext_lock);

	inode_init_once(&ei->vfs_inode);

}

}



static int init_inodecache(void)

{

fs/afs/super.c

+9 −11
Original line number Diff line number Diff line
@@ -451,7 +451,6 @@ static void afs_i_init_once(void *_vnode, struct kmem_cache *cachep, 
{

	struct afs_vnode *vnode = _vnode;



	if (flags & SLAB_CTOR_CONSTRUCTOR) {

	memset(vnode, 0, sizeof(*vnode));

	inode_init_once(&vnode->vfs_inode);

	init_waitqueue_head(&vnode->update_waitq);
@@ -462,7 +461,6 @@ static void afs_i_init_once(void *_vnode, struct kmem_cache *cachep, 
	INIT_LIST_HEAD(&vnode->writebacks);

	INIT_WORK(&vnode->cb_broken_work, afs_broken_callback_work);

}

}



/*

 * allocate an AFS inode struct from our slab cache