From 4ba9b9d0ba0a49d91fa6417c7510ee36f48cf957 Mon Sep 17 00:00:00 2001 From: Christoph Lameter Date: Tue, 16 Oct 2007 23:25:51 -0700 Subject: Slab API: remove useless ctor parameter and reorder parameters Slab constructors currently have a flags parameter that is never used. And the order of the arguments is opposite to other slab functions. The object pointer is placed before the kmem_cache pointer. Convert ctor(void *object, struct kmem_cache *s, unsigned long flags) to ctor(struct kmem_cache *s, void *object) throughout the kernel [akpm@linux-foundation.org: coupla fixes] Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- fs/ocfs2/dlm/dlmfs.c | 5 ++--- fs/ocfs2/super.c | 4 +--- 2 files changed, 3 insertions(+), 6 deletions(-) (limited to 'fs/ocfs2') diff --git a/fs/ocfs2/dlm/dlmfs.c b/fs/ocfs2/dlm/dlmfs.c index 1150412758a..6639baab079 100644 --- a/fs/ocfs2/dlm/dlmfs.c +++ b/fs/ocfs2/dlm/dlmfs.c @@ -255,9 +255,8 @@ static ssize_t dlmfs_file_write(struct file *filp, return writelen; } -static void dlmfs_init_once(void *foo, - struct kmem_cache *cachep, - unsigned long flags) +static void dlmfs_init_once(struct kmem_cache *cachep, + void *foo) { struct dlmfs_inode_private *ip = (struct dlmfs_inode_private *) foo; diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c index 0e2a1b45bf9..be562ac3e89 100644 --- a/fs/ocfs2/super.c +++ b/fs/ocfs2/super.c @@ -1000,9 +1000,7 @@ bail: return status; } -static void ocfs2_inode_init_once(void *data, - struct kmem_cache *cachep, - unsigned long flags) +static void ocfs2_inode_init_once(struct kmem_cache *cachep, void *data) { struct ocfs2_inode_info *oi = data; -- cgit v1.2.3-70-g09d2