The patch titled fs: remove the unused mempages parameter has been added to the -mm tree. Its filename is fs-remove-the-unused-mempages-parameter.patch *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: fs: remove the unused mempages parameter From: Denis Cheng <crquan@xxxxxxxxx> 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 <crquan@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/dcache.c | 8 ++++---- fs/inode.c | 2 +- fs/namespace.c | 2 +- include/linux/fs.h | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff -puN fs/dcache.c~fs-remove-the-unused-mempages-parameter fs/dcache.c --- a/fs/dcache.c~fs-remove-the-unused-mempages-parameter +++ a/fs/dcache.c @@ -2108,7 +2108,7 @@ static void __init dcache_init_early(voi 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 lon 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 -puN fs/inode.c~fs-remove-the-unused-mempages-parameter fs/inode.c --- a/fs/inode.c~fs-remove-the-unused-mempages-parameter +++ a/fs/inode.c @@ -1378,7 +1378,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 -puN fs/namespace.c~fs-remove-the-unused-mempages-parameter fs/namespace.c --- a/fs/namespace.c~fs-remove-the-unused-mempages-parameter +++ a/fs/namespace.c @@ -1811,7 +1811,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 -puN include/linux/fs.h~fs-remove-the-unused-mempages-parameter include/linux/fs.h --- a/include/linux/fs.h~fs-remove-the-unused-mempages-parameter +++ a/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; _ Patches currently in -mm which might be from crquan@xxxxxxxxx are git-gfs2-nmw.patch drivers-net-cxgb3-remove-several-unneeded-zero-initialization.patch nbd-use-list_for_each_entry_safe-to-make-it-more-consolidated-and-readable.patch nbd-change-a-parameters-type-to-remove-a-memcpy-call.patch fs-use-kmem_cache_zalloc-instead.patch fs-remove-the-unused-mempages-parameter.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html