Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched

[mv-sheeva.git] / fs / jfs / super.c

diff --git a/fs/jfs/super.c b/fs/jfs/super.c
index 929fceca7999bb643db1d07fec125d154ad87199..cff60c171943b9b23334428bd650ac829fc19b7b 100644 (file)
--- a/fs/jfs/super.c
+++ b/fs/jfs/super.c
@@ -750,7 +750,7 @@ static struct file_system_type jfs_fs_type = {
        .fs_flags       = FS_REQUIRES_DEV,
 };
 
-static void init_once(void *foo, struct kmem_cache * cachep, unsigned long flags)
+static void init_once(struct kmem_cache *cachep, void *foo)
 {
        struct jfs_inode_info *jfs_ip = (struct jfs_inode_info *) foo;
 
@@ -776,7 +776,7 @@ static int __init init_jfs_fs(void)
        jfs_inode_cachep =
            kmem_cache_create("jfs_ip", sizeof(struct jfs_inode_info), 0,
                            SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
-                           init_once, NULL);
+                           init_once);
        if (jfs_inode_cachep == NULL)
                return -ENOMEM;