From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757099AbXFNWNf (ORCPT ); Thu, 14 Jun 2007 18:13:35 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752203AbXFNWJU (ORCPT ); Thu, 14 Jun 2007 18:09:20 -0400 Received: from canuck.infradead.org ([209.217.80.40]:51008 "EHLO canuck.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753708AbXFNWJR (ORCPT ); Thu, 14 Jun 2007 18:09:17 -0400 Message-Id: <20070614220446.786734789@chello.nl> References: <20070614215817.389524447@chello.nl> User-Agent: quilt/0.46-1 Date: Thu, 14 Jun 2007 23:58:24 +0200 From: Peter Zijlstra To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: miklos@szeredi.hu, akpm@linux-foundation.org, neilb@suse.de, dgc@sgi.com, tomoki.sekiyama.qu@hitachi.com, a.p.zijlstra@chello.nl, nikita@clusterfs.com, trond.myklebust@fys.uio.no, yingchao.zhou@gmail.com, andrea@suse.de Subject: [PATCH 07/17] mm: bdi init hooks Content-Disposition: inline; filename=bdi_init.patch X-Bad-Reply: References but no 'Re:' in Subject. Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org provide BDI constructor/destructor hooks Signed-off-by: Peter Zijlstra --- block/ll_rw_blk.c | 2 ++ drivers/block/rd.c | 6 ++++++ drivers/char/mem.c | 2 ++ drivers/mtd/mtdcore.c | 5 +++++ fs/char_dev.c | 1 + fs/configfs/configfs_internal.h | 2 ++ fs/configfs/inode.c | 8 ++++++++ fs/configfs/mount.c | 2 ++ fs/fuse/inode.c | 2 ++ fs/hugetlbfs/inode.c | 3 +++ fs/nfs/client.c | 3 +++ fs/ocfs2/dlm/dlmfs.c | 6 +++++- fs/ramfs/inode.c | 1 + fs/sysfs/inode.c | 5 +++++ fs/sysfs/mount.c | 2 ++ fs/sysfs/sysfs.h | 1 + include/linux/backing-dev.h | 7 +++++++ mm/readahead.c | 7 +++++++ mm/shmem.c | 1 + mm/swap.c | 4 ++++ 20 files changed, 69 insertions(+), 1 deletion(-) Index: linux-2.6/block/ll_rw_blk.c =================================================================== --- linux-2.6.orig/block/ll_rw_blk.c 2007-06-07 08:57:49.000000000 +0200 +++ linux-2.6/block/ll_rw_blk.c 2007-06-07 16:11:16.000000000 +0200 @@ -1774,6 +1774,7 @@ static void blk_release_queue(struct kob blk_trace_shutdown(q); + bdi_destroy(&q->backing_dev_info); kmem_cache_free(requestq_cachep, q); } @@ -1841,6 +1842,7 @@ request_queue_t *blk_alloc_queue_node(gf q->backing_dev_info.unplug_io_fn = blk_backing_dev_unplug; q->backing_dev_info.unplug_io_data = q; + bdi_init(&q->backing_dev_info); mutex_init(&q->sysfs_lock); Index: linux-2.6/drivers/block/rd.c =================================================================== --- linux-2.6.orig/drivers/block/rd.c 2007-06-07 15:38:55.000000000 +0200 +++ linux-2.6/drivers/block/rd.c 2007-06-07 15:39:34.000000000 +0200 @@ -411,6 +411,9 @@ static void __exit rd_cleanup(void) blk_cleanup_queue(rd_queue[i]); } unregister_blkdev(RAMDISK_MAJOR, "ramdisk"); + + bdi_destroy(&rd_file_backing_dev_info); + bdi_destroy(&rd_backing_dev_info); } /* @@ -421,6 +424,9 @@ static int __init rd_init(void) int i; int err = -ENOMEM; + bdi_init(&rd_backing_dev_info); + bdi_init(&rd_file_backing_dev_info); + if (rd_blocksize > PAGE_SIZE || rd_blocksize < 512 || (rd_blocksize & (rd_blocksize-1))) { printk("RAMDISK: wrong blocksize %d, reverting to defaults\n", Index: linux-2.6/drivers/char/mem.c =================================================================== --- linux-2.6.orig/drivers/char/mem.c 2007-06-06 15:16:25.000000000 +0200 +++ linux-2.6/drivers/char/mem.c 2007-06-07 15:39:34.000000000 +0200 @@ -987,6 +987,8 @@ static int __init chr_dev_init(void) MKDEV(MEM_MAJOR, devlist[i].minor), devlist[i].name); + bdi_init(&zero_bdi); + return 0; } Index: linux-2.6/fs/char_dev.c =================================================================== --- linux-2.6.orig/fs/char_dev.c 2007-06-06 15:16:25.000000000 +0200 +++ linux-2.6/fs/char_dev.c 2007-06-07 15:39:34.000000000 +0200 @@ -546,6 +546,7 @@ static struct kobject *base_probe(dev_t void __init chrdev_init(void) { cdev_map = kobj_map_init(base_probe, &chrdevs_lock); + bdi_init(&directly_mappable_cdev_bdi); } Index: linux-2.6/fs/fuse/inode.c =================================================================== --- linux-2.6.orig/fs/fuse/inode.c 2007-06-07 08:57:55.000000000 +0200 +++ linux-2.6/fs/fuse/inode.c 2007-06-07 15:39:34.000000000 +0200 @@ -433,6 +433,7 @@ static struct fuse_conn *new_conn(void) atomic_set(&fc->num_waiting, 0); fc->bdi.ra_pages = (VM_MAX_READAHEAD * 1024) / PAGE_CACHE_SIZE; fc->bdi.unplug_io_fn = default_unplug_io_fn; + bdi_init(&fc->bdi); fc->reqctr = 0; fc->blocked = 1; get_random_bytes(&fc->scramble_key, sizeof(fc->scramble_key)); @@ -446,6 +447,7 @@ void fuse_conn_put(struct fuse_conn *fc) if (fc->destroy_req) fuse_request_free(fc->destroy_req); mutex_destroy(&fc->inst_mutex); + bdi_destroy(&fc->bdi); kfree(fc); } } Index: linux-2.6/fs/nfs/client.c =================================================================== --- linux-2.6.orig/fs/nfs/client.c 2007-06-07 08:57:55.000000000 +0200 +++ linux-2.6/fs/nfs/client.c 2007-06-07 15:39:34.000000000 +0200 @@ -658,6 +658,8 @@ static void nfs_server_set_fsinfo(struct if (server->rsize > NFS_MAX_FILE_IO_SIZE) server->rsize = NFS_MAX_FILE_IO_SIZE; server->rpages = (server->rsize + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT; + + bdi_init(&server->backing_dev_info); server->backing_dev_info.ra_pages = server->rpages * NFS_MAX_READAHEAD; if (server->wsize > max_rpc_payload) @@ -787,6 +789,7 @@ void nfs_free_server(struct nfs_server * nfs_put_client(server->nfs_client); nfs_free_iostats(server->io_stats); + bdi_destroy(&server->backing_dev_info); kfree(server); nfs_release_automount_timer(); dprintk("<-- nfs_free_server()\n"); Index: linux-2.6/include/linux/backing-dev.h =================================================================== --- linux-2.6.orig/include/linux/backing-dev.h 2007-06-07 15:39:25.000000000 +0200 +++ linux-2.6/include/linux/backing-dev.h 2007-06-07 16:11:19.000000000 +0200 @@ -34,6 +34,13 @@ struct backing_dev_info { void *unplug_io_data; }; +static inline void bdi_init(struct backing_dev_info *bdi) +{ +} + +static inline void bdi_destroy(struct backing_dev_info *bdi) +{ +} /* * Flags in backing_dev_info::capability Index: linux-2.6/drivers/mtd/mtdcore.c =================================================================== --- linux-2.6.orig/drivers/mtd/mtdcore.c 2007-06-06 15:16:25.000000000 +0200 +++ linux-2.6/drivers/mtd/mtdcore.c 2007-06-07 15:39:34.000000000 +0200 @@ -60,6 +60,7 @@ int add_mtd_device(struct mtd_info *mtd) break; } } + bdi_init(mtd->backing_dev_info); BUG_ON(mtd->writesize == 0); mutex_lock(&mtd_table_mutex); @@ -142,6 +143,10 @@ int del_mtd_device (struct mtd_info *mtd } mutex_unlock(&mtd_table_mutex); + + if (mtd->backing_dev_info) + bdi_destroy(mtd->backing_dev_info); + return ret; } Index: linux-2.6/fs/hugetlbfs/inode.c =================================================================== --- linux-2.6.orig/fs/hugetlbfs/inode.c 2007-06-07 15:38:56.000000000 +0200 +++ linux-2.6/fs/hugetlbfs/inode.c 2007-06-07 15:39:34.000000000 +0200 @@ -831,6 +831,8 @@ static int __init init_hugetlbfs_fs(void out: if (error) kmem_cache_destroy(hugetlbfs_inode_cachep); + else + bdi_init(&hugetlbfs_backing_dev_info); return error; } @@ -838,6 +840,7 @@ static void __exit exit_hugetlbfs_fs(voi { kmem_cache_destroy(hugetlbfs_inode_cachep); unregister_filesystem(&hugetlbfs_fs_type); + bdi_destroy(&hugetlbfs_backing_dev_info); } module_init(init_hugetlbfs_fs) Index: linux-2.6/fs/ocfs2/dlm/dlmfs.c =================================================================== --- linux-2.6.orig/fs/ocfs2/dlm/dlmfs.c 2007-06-06 15:16:25.000000000 +0200 +++ linux-2.6/fs/ocfs2/dlm/dlmfs.c 2007-06-07 15:39:34.000000000 +0200 @@ -611,8 +611,10 @@ bail: kmem_cache_destroy(dlmfs_inode_cache); if (cleanup_worker) destroy_workqueue(user_dlm_worker); - } else + } else { + bdi_init(&dlmfs_backing_dev_info); printk("OCFS2 User DLM kernel interface loaded\n"); + } return status; } @@ -624,6 +626,8 @@ static void __exit exit_dlmfs_fs(void) destroy_workqueue(user_dlm_worker); kmem_cache_destroy(dlmfs_inode_cache); + + bdi_destroy(&dlmfs_backing_dev_info); } MODULE_AUTHOR("Oracle"); Index: linux-2.6/fs/configfs/configfs_internal.h =================================================================== --- linux-2.6.orig/fs/configfs/configfs_internal.h 2007-06-06 15:16:25.000000000 +0200 +++ linux-2.6/fs/configfs/configfs_internal.h 2007-06-07 15:39:34.000000000 +0200 @@ -55,6 +55,8 @@ extern int configfs_is_root(struct confi extern struct inode * configfs_new_inode(mode_t mode, struct configfs_dirent *); extern int configfs_create(struct dentry *, int mode, int (*init)(struct inode *)); +extern void configfs_inode_init(void); +extern void configfs_inode_exit(void); extern int configfs_create_file(struct config_item *, const struct configfs_attribute *); extern int configfs_make_dirent(struct configfs_dirent *, Index: linux-2.6/fs/configfs/inode.c =================================================================== --- linux-2.6.orig/fs/configfs/inode.c 2007-06-07 15:38:56.000000000 +0200 +++ linux-2.6/fs/configfs/inode.c 2007-06-07 15:39:34.000000000 +0200 @@ -256,4 +256,12 @@ void configfs_hash_and_remove(struct den mutex_unlock(&dir->d_inode->i_mutex); } +void __init configfs_inode_init(void) +{ + bdi_init(&configfs_backing_dev_info); +} +void __exit configfs_inode_exit(void) +{ + bdi_destroy(&configfs_backing_dev_info); +} Index: linux-2.6/fs/configfs/mount.c =================================================================== --- linux-2.6.orig/fs/configfs/mount.c 2007-06-06 15:16:25.000000000 +0200 +++ linux-2.6/fs/configfs/mount.c 2007-06-07 15:39:34.000000000 +0200 @@ -156,6 +156,7 @@ static int __init configfs_init(void) configfs_dir_cachep = NULL; } + configfs_inode_init(); out: return err; } @@ -166,6 +167,7 @@ static void __exit configfs_exit(void) subsystem_unregister(&config_subsys); kmem_cache_destroy(configfs_dir_cachep); configfs_dir_cachep = NULL; + configfs_inode_exit(); } MODULE_AUTHOR("Oracle"); Index: linux-2.6/fs/ramfs/inode.c =================================================================== --- linux-2.6.orig/fs/ramfs/inode.c 2007-06-06 15:16:25.000000000 +0200 +++ linux-2.6/fs/ramfs/inode.c 2007-06-07 15:39:34.000000000 +0200 @@ -223,6 +223,7 @@ module_exit(exit_ramfs_fs) int __init init_rootfs(void) { + bdi_init(&ramfs_backing_dev_info); return register_filesystem(&rootfs_fs_type); } Index: linux-2.6/fs/sysfs/inode.c =================================================================== --- linux-2.6.orig/fs/sysfs/inode.c 2007-06-07 15:38:56.000000000 +0200 +++ linux-2.6/fs/sysfs/inode.c 2007-06-07 15:39:34.000000000 +0200 @@ -34,6 +34,11 @@ static const struct inode_operations sys .setattr = sysfs_setattr, }; +void __init sysfs_inode_init(void) +{ + bdi_init(&sysfs_backing_dev_info); +} + void sysfs_delete_inode(struct inode *inode) { /* Free the shadowed directory inode operations */ Index: linux-2.6/fs/sysfs/mount.c =================================================================== --- linux-2.6.orig/fs/sysfs/mount.c 2007-06-06 15:22:15.000000000 +0200 +++ linux-2.6/fs/sysfs/mount.c 2007-06-07 15:39:34.000000000 +0200 @@ -103,6 +103,8 @@ int __init sysfs_init(void) } else goto out_err; out: + if (!err) + sysfs_inode_init(); return err; out_err: kmem_cache_destroy(sysfs_dir_cachep); Index: linux-2.6/fs/sysfs/sysfs.h =================================================================== --- linux-2.6.orig/fs/sysfs/sysfs.h 2007-06-06 15:22:15.000000000 +0200 +++ linux-2.6/fs/sysfs/sysfs.h 2007-06-07 15:39:43.000000000 +0200 @@ -57,6 +57,7 @@ extern void sysfs_delete_inode(struct in extern void sysfs_init_inode(struct sysfs_dirent *sd, struct inode *inode); extern struct inode * sysfs_get_inode(struct sysfs_dirent *sd); extern void sysfs_instantiate(struct dentry *dentry, struct inode *inode); +extern void sysfs_inode_init(void); extern void release_sysfs_dirent(struct sysfs_dirent * sd); extern int sysfs_dirent_exist(struct sysfs_dirent *, const unsigned char *); Index: linux-2.6/mm/shmem.c =================================================================== --- linux-2.6.orig/mm/shmem.c 2007-06-07 15:38:59.000000000 +0200 +++ linux-2.6/mm/shmem.c 2007-06-07 15:39:34.000000000 +0200 @@ -2444,6 +2444,7 @@ static int __init init_tmpfs(void) printk(KERN_ERR "Could not kern_mount tmpfs\n"); goto out1; } + bdi_init(&shmem_backing_dev_info); return 0; out1: Index: linux-2.6/mm/swap.c =================================================================== --- linux-2.6.orig/mm/swap.c 2007-06-07 08:57:57.000000000 +0200 +++ linux-2.6/mm/swap.c 2007-06-07 15:39:34.000000000 +0200 @@ -550,6 +550,10 @@ void __init swap_setup(void) { unsigned long megs = num_physpages >> (20 - PAGE_SHIFT); +#ifdef CONFIG_SWAP + bdi_init(swapper_space.backing_dev_info); +#endif + /* Use a smaller cluster for small-memory machines */ if (megs < 16) page_cluster = 2; Index: linux-2.6/mm/readahead.c =================================================================== --- linux-2.6.orig/mm/readahead.c 2007-06-07 15:38:59.000000000 +0200 +++ linux-2.6/mm/readahead.c 2007-06-07 15:39:34.000000000 +0200 @@ -242,6 +242,13 @@ unsigned long max_sane_readahead(unsigne + node_page_state(numa_node_id(), NR_FREE_PAGES)) / 2); } +static int __init readahead_init(void) +{ + bdi_init(&default_backing_dev_info); + return 0; +} +subsys_initcall(readahead_init); + /* * Submit IO for the read-ahead request in file_ra_state. */ --