From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753255AbbF3Grx (ORCPT ); Tue, 30 Jun 2015 02:47:53 -0400 Received: from cantor2.suse.de ([195.135.220.15]:49436 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753211AbbF3Grv (ORCPT ); Tue, 30 Jun 2015 02:47:51 -0400 Date: Tue, 30 Jun 2015 08:47:44 +0200 From: Jan Kara To: Tejun Heo Cc: axboe@kernel.dk, linux-kernel@vger.kernel.org, jack@suse.cz, hch@infradead.org, hannes@cmpxchg.org, linux-fsdevel@vger.kernel.org, vgoyal@redhat.com, lizefan@huawei.com, cgroups@vger.kernel.org, linux-mm@kvack.org, mhocko@suse.cz, clm@fb.com, fengguang.wu@intel.com, david@fromorbit.com, gthelen@google.com, khlebnikov@yandex-team.ru Subject: Re: [PATCH 19/51] bdi: make inode_to_bdi() inline Message-ID: <20150630064744.GE7252@quack.suse.cz> References: <1432329245-5844-1-git-send-email-tj@kernel.org> <1432329245-5844-20-git-send-email-tj@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1432329245-5844-20-git-send-email-tj@kernel.org> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri 22-05-15 17:13:33, Tejun Heo wrote: > Now that bdi definitions are moved to backing-dev-defs.h, > backing-dev.h can include blkdev.h and inline inode_to_bdi() without > worrying about introducing circular include dependency. The function > gets called from hot paths and fairly trivial. > > This patch makes inode_to_bdi() and sb_is_blkdev_sb() that the > function calls inline. blockdev_superblock and noop_backing_dev_info > are EXPORT_GPL'd to allow the inline functions to be used from > modules. > > While at it, make sb_is_blkdev_sb() return bool instead of int. > > v2: Fixed typo in description as suggested by Jan. > > Signed-off-by: Tejun Heo > Reviewed-by: Jens Axboe > Cc: Christoph Hellwig Looks good. Reviewed-by: Jan Kara Honza > --- > fs/block_dev.c | 8 ++------ > fs/fs-writeback.c | 16 ---------------- > include/linux/backing-dev.h | 18 ++++++++++++++++-- > include/linux/fs.h | 8 +++++++- > mm/backing-dev.c | 1 + > 5 files changed, 26 insertions(+), 25 deletions(-) > > diff --git a/fs/block_dev.c b/fs/block_dev.c > index e545cbf..f04c873 100644 > --- a/fs/block_dev.c > +++ b/fs/block_dev.c > @@ -547,7 +547,8 @@ static struct file_system_type bd_type = { > .kill_sb = kill_anon_super, > }; > > -static struct super_block *blockdev_superblock __read_mostly; > +struct super_block *blockdev_superblock __read_mostly; > +EXPORT_SYMBOL_GPL(blockdev_superblock); > > void __init bdev_cache_init(void) > { > @@ -688,11 +689,6 @@ static struct block_device *bd_acquire(struct inode *inode) > return bdev; > } > > -int sb_is_blkdev_sb(struct super_block *sb) > -{ > - return sb == blockdev_superblock; > -} > - > /* Call when you free inode */ > > void bd_forget(struct inode *inode) > diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c > index a69d2e1..34d1cb8 100644 > --- a/fs/fs-writeback.c > +++ b/fs/fs-writeback.c > @@ -78,22 +78,6 @@ int writeback_in_progress(struct backing_dev_info *bdi) > } > EXPORT_SYMBOL(writeback_in_progress); > > -struct backing_dev_info *inode_to_bdi(struct inode *inode) > -{ > - struct super_block *sb; > - > - if (!inode) > - return &noop_backing_dev_info; > - > - sb = inode->i_sb; > -#ifdef CONFIG_BLOCK > - if (sb_is_blkdev_sb(sb)) > - return blk_get_backing_dev_info(I_BDEV(inode)); > -#endif > - return sb->s_bdi; > -} > -EXPORT_SYMBOL_GPL(inode_to_bdi); > - > static inline struct inode *wb_inode(struct list_head *head) > { > return list_entry(head, struct inode, i_wb_list); > diff --git a/include/linux/backing-dev.h b/include/linux/backing-dev.h > index 5e39f7a..7857820 100644 > --- a/include/linux/backing-dev.h > +++ b/include/linux/backing-dev.h > @@ -11,11 +11,10 @@ > #include > #include > #include > +#include > #include > #include > > -struct backing_dev_info *inode_to_bdi(struct inode *inode); > - > int __must_check bdi_init(struct backing_dev_info *bdi); > void bdi_destroy(struct backing_dev_info *bdi); > > @@ -149,6 +148,21 @@ extern struct backing_dev_info noop_backing_dev_info; > > int writeback_in_progress(struct backing_dev_info *bdi); > > +static inline struct backing_dev_info *inode_to_bdi(struct inode *inode) > +{ > + struct super_block *sb; > + > + if (!inode) > + return &noop_backing_dev_info; > + > + sb = inode->i_sb; > +#ifdef CONFIG_BLOCK > + if (sb_is_blkdev_sb(sb)) > + return blk_get_backing_dev_info(I_BDEV(inode)); > +#endif > + return sb->s_bdi; > +} > + > static inline int bdi_congested(struct backing_dev_info *bdi, int bdi_bits) > { > if (bdi->congested_fn) > diff --git a/include/linux/fs.h b/include/linux/fs.h > index 1ef6390..ce100b87 100644 > --- a/include/linux/fs.h > +++ b/include/linux/fs.h > @@ -2240,7 +2240,13 @@ extern struct super_block *freeze_bdev(struct block_device *); > extern void emergency_thaw_all(void); > extern int thaw_bdev(struct block_device *bdev, struct super_block *sb); > extern int fsync_bdev(struct block_device *); > -extern int sb_is_blkdev_sb(struct super_block *sb); > + > +extern struct super_block *blockdev_superblock; > + > +static inline bool sb_is_blkdev_sb(struct super_block *sb) > +{ > + return sb == blockdev_superblock; > +} > #else > static inline void bd_forget(struct inode *inode) {} > static inline int sync_blockdev(struct block_device *bdev) { return 0; } > diff --git a/mm/backing-dev.c b/mm/backing-dev.c > index ff85ecb..b0707d1 100644 > --- a/mm/backing-dev.c > +++ b/mm/backing-dev.c > @@ -18,6 +18,7 @@ struct backing_dev_info noop_backing_dev_info = { > .name = "noop", > .capabilities = BDI_CAP_NO_ACCT_AND_WRITEBACK, > }; > +EXPORT_SYMBOL_GPL(noop_backing_dev_info); > > static struct class *bdi_class; > > -- > 2.4.0 > -- Jan Kara SUSE Labs, CR From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Kara Subject: Re: [PATCH 19/51] bdi: make inode_to_bdi() inline Date: Tue, 30 Jun 2015 08:47:44 +0200 Message-ID: <20150630064744.GE7252@quack.suse.cz> References: <1432329245-5844-1-git-send-email-tj@kernel.org> <1432329245-5844-20-git-send-email-tj@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: axboe@kernel.dk, linux-kernel@vger.kernel.org, jack@suse.cz, hch@infradead.org, hannes@cmpxchg.org, linux-fsdevel@vger.kernel.org, vgoyal@redhat.com, lizefan@huawei.com, cgroups@vger.kernel.org, linux-mm@kvack.org, mhocko@suse.cz, clm@fb.com, fengguang.wu@intel.com, david@fromorbit.com, gthelen@google.com, khlebnikov@yandex-team.ru To: Tejun Heo Return-path: Content-Disposition: inline In-Reply-To: <1432329245-5844-20-git-send-email-tj@kernel.org> Sender: owner-linux-mm@kvack.org List-Id: linux-fsdevel.vger.kernel.org On Fri 22-05-15 17:13:33, Tejun Heo wrote: > Now that bdi definitions are moved to backing-dev-defs.h, > backing-dev.h can include blkdev.h and inline inode_to_bdi() without > worrying about introducing circular include dependency. The function > gets called from hot paths and fairly trivial. > > This patch makes inode_to_bdi() and sb_is_blkdev_sb() that the > function calls inline. blockdev_superblock and noop_backing_dev_info > are EXPORT_GPL'd to allow the inline functions to be used from > modules. > > While at it, make sb_is_blkdev_sb() return bool instead of int. > > v2: Fixed typo in description as suggested by Jan. > > Signed-off-by: Tejun Heo > Reviewed-by: Jens Axboe > Cc: Christoph Hellwig Looks good. Reviewed-by: Jan Kara Honza > --- > fs/block_dev.c | 8 ++------ > fs/fs-writeback.c | 16 ---------------- > include/linux/backing-dev.h | 18 ++++++++++++++++-- > include/linux/fs.h | 8 +++++++- > mm/backing-dev.c | 1 + > 5 files changed, 26 insertions(+), 25 deletions(-) > > diff --git a/fs/block_dev.c b/fs/block_dev.c > index e545cbf..f04c873 100644 > --- a/fs/block_dev.c > +++ b/fs/block_dev.c > @@ -547,7 +547,8 @@ static struct file_system_type bd_type = { > .kill_sb = kill_anon_super, > }; > > -static struct super_block *blockdev_superblock __read_mostly; > +struct super_block *blockdev_superblock __read_mostly; > +EXPORT_SYMBOL_GPL(blockdev_superblock); > > void __init bdev_cache_init(void) > { > @@ -688,11 +689,6 @@ static struct block_device *bd_acquire(struct inode *inode) > return bdev; > } > > -int sb_is_blkdev_sb(struct super_block *sb) > -{ > - return sb == blockdev_superblock; > -} > - > /* Call when you free inode */ > > void bd_forget(struct inode *inode) > diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c > index a69d2e1..34d1cb8 100644 > --- a/fs/fs-writeback.c > +++ b/fs/fs-writeback.c > @@ -78,22 +78,6 @@ int writeback_in_progress(struct backing_dev_info *bdi) > } > EXPORT_SYMBOL(writeback_in_progress); > > -struct backing_dev_info *inode_to_bdi(struct inode *inode) > -{ > - struct super_block *sb; > - > - if (!inode) > - return &noop_backing_dev_info; > - > - sb = inode->i_sb; > -#ifdef CONFIG_BLOCK > - if (sb_is_blkdev_sb(sb)) > - return blk_get_backing_dev_info(I_BDEV(inode)); > -#endif > - return sb->s_bdi; > -} > -EXPORT_SYMBOL_GPL(inode_to_bdi); > - > static inline struct inode *wb_inode(struct list_head *head) > { > return list_entry(head, struct inode, i_wb_list); > diff --git a/include/linux/backing-dev.h b/include/linux/backing-dev.h > index 5e39f7a..7857820 100644 > --- a/include/linux/backing-dev.h > +++ b/include/linux/backing-dev.h > @@ -11,11 +11,10 @@ > #include > #include > #include > +#include > #include > #include > > -struct backing_dev_info *inode_to_bdi(struct inode *inode); > - > int __must_check bdi_init(struct backing_dev_info *bdi); > void bdi_destroy(struct backing_dev_info *bdi); > > @@ -149,6 +148,21 @@ extern struct backing_dev_info noop_backing_dev_info; > > int writeback_in_progress(struct backing_dev_info *bdi); > > +static inline struct backing_dev_info *inode_to_bdi(struct inode *inode) > +{ > + struct super_block *sb; > + > + if (!inode) > + return &noop_backing_dev_info; > + > + sb = inode->i_sb; > +#ifdef CONFIG_BLOCK > + if (sb_is_blkdev_sb(sb)) > + return blk_get_backing_dev_info(I_BDEV(inode)); > +#endif > + return sb->s_bdi; > +} > + > static inline int bdi_congested(struct backing_dev_info *bdi, int bdi_bits) > { > if (bdi->congested_fn) > diff --git a/include/linux/fs.h b/include/linux/fs.h > index 1ef6390..ce100b87 100644 > --- a/include/linux/fs.h > +++ b/include/linux/fs.h > @@ -2240,7 +2240,13 @@ extern struct super_block *freeze_bdev(struct block_device *); > extern void emergency_thaw_all(void); > extern int thaw_bdev(struct block_device *bdev, struct super_block *sb); > extern int fsync_bdev(struct block_device *); > -extern int sb_is_blkdev_sb(struct super_block *sb); > + > +extern struct super_block *blockdev_superblock; > + > +static inline bool sb_is_blkdev_sb(struct super_block *sb) > +{ > + return sb == blockdev_superblock; > +} > #else > static inline void bd_forget(struct inode *inode) {} > static inline int sync_blockdev(struct block_device *bdev) { return 0; } > diff --git a/mm/backing-dev.c b/mm/backing-dev.c > index ff85ecb..b0707d1 100644 > --- a/mm/backing-dev.c > +++ b/mm/backing-dev.c > @@ -18,6 +18,7 @@ struct backing_dev_info noop_backing_dev_info = { > .name = "noop", > .capabilities = BDI_CAP_NO_ACCT_AND_WRITEBACK, > }; > +EXPORT_SYMBOL_GPL(noop_backing_dev_info); > > static struct class *bdi_class; > > -- > 2.4.0 > -- Jan Kara SUSE Labs, CR -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org