From: Denis Cheng Date: Wed, 17 Oct 2007 06:26:30 +0000 (-0700) Subject: fs: remove the unused mempages parameter X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=74bf17cffc32511c7c6d70fe7f376b92662e186e;p=openwrt%2Fstaging%2Fblogic.git fs: remove the unused mempages parameter Since the mempages parameter is actually not used, they should be removed. Now there is only files_init use the mempages parameter, files_init(mempages); but I don't think the adaptation to mempages in files_init is really useful; and if files_init also changed to the prototype void (*func)(void), the wrapper vfs_caches_init would also not need the mempages parameter. Signed-off-by: Denis Cheng Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/fs/dcache.c b/fs/dcache.c index 7da0cf50873e..920c87720385 100644 --- a/fs/dcache.c +++ b/fs/dcache.c @@ -2108,7 +2108,7 @@ static void __init dcache_init_early(void) INIT_HLIST_HEAD(&dentry_hashtable[loop]); } -static void __init dcache_init(unsigned long mempages) +static void __init dcache_init(void) { int loop; @@ -2170,10 +2170,10 @@ void __init vfs_caches_init(unsigned long mempages) filp_cachep = kmem_cache_create("filp", sizeof(struct file), 0, SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL); - dcache_init(mempages); - inode_init(mempages); + dcache_init(); + inode_init(); files_init(mempages); - mnt_init(mempages); + mnt_init(); bdev_cache_init(); chrdev_init(); } diff --git a/fs/inode.c b/fs/inode.c index ee93b3e67977..c6165771e00e 100644 --- a/fs/inode.c +++ b/fs/inode.c @@ -1396,7 +1396,7 @@ void __init inode_init_early(void) INIT_HLIST_HEAD(&inode_hashtable[loop]); } -void __init inode_init(unsigned long mempages) +void __init inode_init(void) { int loop; diff --git a/fs/namespace.c b/fs/namespace.c index ddbda13c2d31..07daa7972591 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -1791,7 +1791,7 @@ static void __init init_mount_tree(void) set_fs_root(current->fs, ns->root, ns->root->mnt_root); } -void __init mnt_init(unsigned long mempages) +void __init mnt_init(void) { struct list_head *d; unsigned int nr_hash; diff --git a/include/linux/fs.h b/include/linux/fs.h index 8b3580d0664e..73f0bdbe436a 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -300,9 +300,9 @@ struct kstatfs; struct vm_area_struct; struct vfsmount; -extern void __init inode_init(unsigned long); +extern void __init inode_init(void); extern void __init inode_init_early(void); -extern void __init mnt_init(unsigned long); +extern void __init mnt_init(void); extern void __init files_init(unsigned long); struct buffer_head;