aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ocfs2
diff options
context:
space:
mode:
authorChristoph Lameter <clameter@sgi.com>2007-10-17 02:25:51 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-17 11:42:45 -0400
commit4ba9b9d0ba0a49d91fa6417c7510ee36f48cf957 (patch)
tree191b4f45f926e44b882b1e87a9a85dc12230b892 /fs/ocfs2
parentb811c202a0edadaac7242ab834fe7ba409978ae7 (diff)
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 <clameter@sgi.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/ocfs2')
-rw-r--r--fs/ocfs2/dlm/dlmfs.c5
-rw-r--r--fs/ocfs2/super.c4
2 files changed, 3 insertions, 6 deletions
diff --git a/fs/ocfs2/dlm/dlmfs.c b/fs/ocfs2/dlm/dlmfs.c
index 1150412758ac..6639baab0798 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,
255 return writelen; 255 return writelen;
256} 256}
257 257
258static void dlmfs_init_once(void *foo, 258static void dlmfs_init_once(struct kmem_cache *cachep,
259 struct kmem_cache *cachep, 259 void *foo)
260 unsigned long flags)
261{ 260{
262 struct dlmfs_inode_private *ip = 261 struct dlmfs_inode_private *ip =
263 (struct dlmfs_inode_private *) foo; 262 (struct dlmfs_inode_private *) foo;
diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
index 0e2a1b45bf92..be562ac3e89c 100644
--- a/fs/ocfs2/super.c
+++ b/fs/ocfs2/super.c
@@ -1000,9 +1000,7 @@ bail:
1000 return status; 1000 return status;
1001} 1001}
1002 1002
1003static void ocfs2_inode_init_once(void *data, 1003static void ocfs2_inode_init_once(struct kmem_cache *cachep, void *data)
1004 struct kmem_cache *cachep,
1005 unsigned long flags)
1006{ 1004{
1007 struct ocfs2_inode_info *oi = data; 1005 struct ocfs2_inode_info *oi = data;
1008 1006