aboutsummaryrefslogtreecommitdiffstats
path: root/fs/afs/super.c
diff options
context:
space:
mode:
authorChristoph Lameter <clameter@sgi.com>2007-05-17 01:10:57 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-17 08:23:04 -0400
commita35afb830f8d71ec211531aeb9a621b09a2efb39 (patch)
tree198280081e1f8b2f6c450742a5075cc7904a3d58 /fs/afs/super.c
parent5577bd8a85c8b7643a241789b14fafa9c8a6c7db (diff)
Remove SLAB_CTOR_CONSTRUCTOR
SLAB_CTOR_CONSTRUCTOR is always specified. No point in checking it. Signed-off-by: Christoph 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: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/afs/super.c')
-rw-r--r--fs/afs/super.c20
1 files changed, 9 insertions, 11 deletions
diff --git a/fs/afs/super.c b/fs/afs/super.c
index 370cecc910d..8d47ad88a09 100644
--- a/fs/afs/super.c
+++ b/fs/afs/super.c
@@ -451,17 +451,15 @@ static void afs_i_init_once(void *_vnode, struct kmem_cache *cachep,
451{ 451{
452 struct afs_vnode *vnode = _vnode; 452 struct afs_vnode *vnode = _vnode;
453 453
454 if (flags & SLAB_CTOR_CONSTRUCTOR) { 454 memset(vnode, 0, sizeof(*vnode));
455 memset(vnode, 0, sizeof(*vnode)); 455 inode_init_once(&vnode->vfs_inode);
456 inode_init_once(&vnode->vfs_inode); 456 init_waitqueue_head(&vnode->update_waitq);
457 init_waitqueue_head(&vnode->update_waitq); 457 mutex_init(&vnode->permits_lock);
458 mutex_init(&vnode->permits_lock); 458 mutex_init(&vnode->validate_lock);
459 mutex_init(&vnode->validate_lock); 459 spin_lock_init(&vnode->writeback_lock);
460 spin_lock_init(&vnode->writeback_lock); 460 spin_lock_init(&vnode->lock);
461 spin_lock_init(&vnode->lock); 461 INIT_LIST_HEAD(&vnode->writebacks);
462 INIT_LIST_HEAD(&vnode->writebacks); 462 INIT_WORK(&vnode->cb_broken_work, afs_broken_callback_work);
463 INIT_WORK(&vnode->cb_broken_work, afs_broken_callback_work);
464 }
465} 463}
466 464
467/* 465/*