Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

mm: don't include <linux/blkdev.h> in <linux/backing-dev.h>

Move inode_to_bdi out of line to avoid having to include blkdev.h.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Link: https://lore.kernel.org/r/20210920123328.1399408-4-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>

authored by

Christoph Hellwig and committed by
Jens Axboe
ccdf7741 e41d12f5

+21 -16
+1
drivers/mtd/mtdsuper.c
··· 15 15 #include <linux/slab.h> 16 16 #include <linux/major.h> 17 17 #include <linux/backing-dev.h> 18 + #include <linux/blkdev.h> 18 19 #include <linux/fs_context.h> 19 20 #include "mtdcore.h" 20 21
+1
fs/ntfs/file.c
··· 5 5 * Copyright (c) 2001-2015 Anton Altaparmakov and Tuxera Inc. 6 6 */ 7 7 8 + #include <linux/blkdev.h> 8 9 #include <linux/backing-dev.h> 9 10 #include <linux/buffer_head.h> 10 11 #include <linux/gfp.h>
+1
fs/ntfs3/file.c
··· 8 8 */ 9 9 10 10 #include <linux/backing-dev.h> 11 + #include <linux/blkdev.h> 11 12 #include <linux/buffer_head.h> 12 13 #include <linux/compat.h> 13 14 #include <linux/falloc.h>
+1 -1
fs/orangefs/inode.c
··· 10 10 * Linux VFS inode operations. 11 11 */ 12 12 13 - #include <linux/bvec.h> 13 + #include <linux/blkdev.h> 14 14 #include <linux/fileattr.h> 15 15 #include "protocol.h" 16 16 #include "orangefs-kernel.h"
+1 -15
include/linux/backing-dev.h
··· 12 12 #include <linux/kernel.h> 13 13 #include <linux/fs.h> 14 14 #include <linux/sched.h> 15 - #include <linux/blkdev.h> 16 15 #include <linux/device.h> 17 16 #include <linux/writeback.h> 18 17 #include <linux/backing-dev-defs.h> ··· 133 134 return test_bit(WB_writeback_running, &wb->state); 134 135 } 135 136 136 - static inline struct backing_dev_info *inode_to_bdi(struct inode *inode) 137 - { 138 - struct super_block *sb; 139 - 140 - if (!inode) 141 - return &noop_backing_dev_info; 142 - 143 - sb = inode->i_sb; 144 - #ifdef CONFIG_BLOCK 145 - if (sb_is_blkdev_sb(sb)) 146 - return I_BDEV(inode)->bd_disk->bdi; 147 - #endif 148 - return sb->s_bdi; 149 - } 137 + struct backing_dev_info *inode_to_bdi(struct inode *inode); 150 138 151 139 static inline int wb_congested(struct bdi_writeback *wb, int cong_bits) 152 140 {
+16
mm/backing-dev.c
··· 978 978 } 979 979 EXPORT_SYMBOL(bdi_put); 980 980 981 + struct backing_dev_info *inode_to_bdi(struct inode *inode) 982 + { 983 + struct super_block *sb; 984 + 985 + if (!inode) 986 + return &noop_backing_dev_info; 987 + 988 + sb = inode->i_sb; 989 + #ifdef CONFIG_BLOCK 990 + if (sb_is_blkdev_sb(sb)) 991 + return I_BDEV(inode)->bd_disk->bdi; 992 + #endif 993 + return sb->s_bdi; 994 + } 995 + EXPORT_SYMBOL(inode_to_bdi); 996 + 981 997 const char *bdi_dev_name(struct backing_dev_info *bdi) 982 998 { 983 999 if (!bdi || !bdi->dev)