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

block,fs: untangle fs.h and blk_types.h

Nothing in fs.h should require blk_types.h to be included.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>

authored by

Christoph Hellwig and committed by
Jens Axboe
2f8b5444 1e3914d4

+19 -1
+1
fs/9p/vfs_addr.c
··· 34 34 #include <linux/idr.h> 35 35 #include <linux/sched.h> 36 36 #include <linux/uio.h> 37 + #include <linux/bvec.h> 37 38 #include <net/9p/9p.h> 38 39 #include <net/9p/client.h> 39 40
+1
fs/cifs/connect.c
··· 41 41 #include <keys/user-type.h> 42 42 #include <net/ipv6.h> 43 43 #include <linux/parser.h> 44 + #include <linux/bvec.h> 44 45 45 46 #include "cifspdu.h" 46 47 #include "cifsglob.h"
+1
fs/cifs/transport.c
··· 28 28 #include <linux/delay.h> 29 29 #include <linux/freezer.h> 30 30 #include <linux/tcp.h> 31 + #include <linux/bvec.h> 31 32 #include <linux/highmem.h> 32 33 #include <asm/uaccess.h> 33 34 #include <asm/processor.h>
+1
fs/gfs2/dir.c
··· 62 62 #include <linux/gfs2_ondisk.h> 63 63 #include <linux/crc32.h> 64 64 #include <linux/vmalloc.h> 65 + #include <linux/bio.h> 65 66 66 67 #include "gfs2.h" 67 68 #include "incore.h"
+1
fs/isofs/compress.c
··· 18 18 19 19 #include <linux/module.h> 20 20 #include <linux/init.h> 21 + #include <linux/bio.h> 21 22 22 23 #include <linux/vmalloc.h> 23 24 #include <linux/zlib.h>
+1
fs/ntfs/logfile.c
··· 27 27 #include <linux/buffer_head.h> 28 28 #include <linux/bitops.h> 29 29 #include <linux/log2.h> 30 + #include <linux/bio.h> 30 31 31 32 #include "attrib.h" 32 33 #include "aops.h"
+1
fs/ocfs2/buffer_head_io.c
··· 26 26 #include <linux/fs.h> 27 27 #include <linux/types.h> 28 28 #include <linux/highmem.h> 29 + #include <linux/bio.h> 29 30 30 31 #include <cluster/masklog.h> 31 32
+1
fs/orangefs/inode.c
··· 8 8 * Linux VFS inode operations. 9 9 */ 10 10 11 + #include <linux/bvec.h> 11 12 #include "protocol.h" 12 13 #include "orangefs-kernel.h" 13 14 #include "orangefs-bufmap.h"
+1
fs/reiserfs/stree.c
··· 11 11 #include <linux/time.h> 12 12 #include <linux/string.h> 13 13 #include <linux/pagemap.h> 14 + #include <linux/bio.h> 14 15 #include "reiserfs.h" 15 16 #include <linux/buffer_head.h> 16 17 #include <linux/quotaops.h>
+1
fs/squashfs/block.c
··· 31 31 #include <linux/slab.h> 32 32 #include <linux/string.h> 33 33 #include <linux/buffer_head.h> 34 + #include <linux/bio.h> 34 35 35 36 #include "squashfs_fs.h" 36 37 #include "squashfs_fs_sb.h"
+1
fs/udf/dir.c
··· 30 30 #include <linux/errno.h> 31 31 #include <linux/mm.h> 32 32 #include <linux/slab.h> 33 + #include <linux/bio.h> 33 34 34 35 #include "udf_i.h" 35 36 #include "udf_sb.h"
+1
fs/udf/directory.c
··· 16 16 17 17 #include <linux/fs.h> 18 18 #include <linux/string.h> 19 + #include <linux/bio.h> 19 20 20 21 struct fileIdentDesc *udf_fileident_read(struct inode *dir, loff_t *nf_pos, 21 22 struct udf_fileident_bh *fibh,
+1
fs/udf/inode.c
··· 38 38 #include <linux/crc-itu-t.h> 39 39 #include <linux/mpage.h> 40 40 #include <linux/uio.h> 41 + #include <linux/bio.h> 41 42 42 43 #include "udf_i.h" 43 44 #include "udf_sb.h"
+1
fs/ufs/balloc.c
··· 15 15 #include <linux/buffer_head.h> 16 16 #include <linux/capability.h> 17 17 #include <linux/bitops.h> 18 + #include <linux/bio.h> 18 19 #include <asm/byteorder.h> 19 20 20 21 #include "ufs_fs.h"
+1 -1
include/linux/fs.h
··· 28 28 #include <linux/uidgid.h> 29 29 #include <linux/lockdep.h> 30 30 #include <linux/percpu-rwsem.h> 31 - #include <linux/blk_types.h> 32 31 #include <linux/workqueue.h> 33 32 #include <linux/percpu-rwsem.h> 34 33 #include <linux/delayed_call.h> ··· 37 38 38 39 struct backing_dev_info; 39 40 struct bdi_writeback; 41 + struct bio; 40 42 struct export_operations; 41 43 struct hd_geometry; 42 44 struct iovec;
+1
include/linux/swap.h
··· 11 11 #include <linux/fs.h> 12 12 #include <linux/atomic.h> 13 13 #include <linux/page-flags.h> 14 + #include <linux/blk_types.h> 14 15 #include <asm/page.h> 15 16 16 17 struct notifier_block;
+2
include/linux/writeback.h
··· 10 10 #include <linux/flex_proportions.h> 11 11 #include <linux/backing-dev-defs.h> 12 12 13 + struct bio; 14 + 13 15 DECLARE_PER_CPU(int, dirty_throttle_leaks); 14 16 15 17 /*
+1
lib/iov_iter.c
··· 1 1 #include <linux/export.h> 2 + #include <linux/bvec.h> 2 3 #include <linux/uio.h> 3 4 #include <linux/pagemap.h> 4 5 #include <linux/slab.h>