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>

diff --git a/fs/9p/vfs_addr.c b/fs/9p/vfs_addr.c
index 6181ad79e1a543f307ff4245e5159330c8a5fa7c..5ca1fb0043f6505c6958a16bc2c9688d7af6a291 100644 (file)
--- a/fs/9p/vfs_addr.c
+++ b/fs/9p/vfs_addr.c
@@ -34,6 +34,7 @@
 #include <linux/idr.h>
 #include <linux/sched.h>
 #include <linux/uio.h>
+#include <linux/bvec.h>
 #include <net/9p/9p.h>
 #include <net/9p/client.h>
 

diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index aab5227979e2ee27c1858b47f9bf33c275f27633..db726e8311caeceb3355ffecd81d5f21ad0989f8 100644 (file)
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -41,6 +41,7 @@
 #include <keys/user-type.h>
 #include <net/ipv6.h>
 #include <linux/parser.h>
+#include <linux/bvec.h>
 
 #include "cifspdu.h"
 #include "cifsglob.h"

diff --git a/fs/cifs/transport.c b/fs/cifs/transport.c
index 206a597b2293cb2ea2d0e6606e8e8f0e01ff9e0b..5f02edc819af277cfd88a7897f37b34771278b36 100644 (file)
--- a/fs/cifs/transport.c
+++ b/fs/cifs/transport.c
@@ -28,6 +28,7 @@
 #include <linux/delay.h>
 #include <linux/freezer.h>
 #include <linux/tcp.h>
+#include <linux/bvec.h>
 #include <linux/highmem.h>
 #include <asm/uaccess.h>
 #include <asm/processor.h>

diff --git a/fs/gfs2/dir.c b/fs/gfs2/dir.c
index 3cdde5f5d399c93a7e9f290bb1d053ea297debac..79113219be5f983c7ecf62d56c5fd6d6f87a57b6 100644 (file)
--- a/fs/gfs2/dir.c
+++ b/fs/gfs2/dir.c
@@ -62,6 +62,7 @@
 #include <linux/gfs2_ondisk.h>
 #include <linux/crc32.h>
 #include <linux/vmalloc.h>
+#include <linux/bio.h>
 
 #include "gfs2.h"
 #include "incore.h"

diff --git a/fs/isofs/compress.c b/fs/isofs/compress.c
index 44af14b2e91663b76427afee24c2788d2b2aeb93..9bb2fe35799d3d306fde5b06ff699af753d66aff 100644 (file)
--- a/fs/isofs/compress.c
+++ b/fs/isofs/compress.c
@@ -18,6 +18,7 @@
 
 #include <linux/module.h>
 #include <linux/init.h>
+#include <linux/bio.h>
 
 #include <linux/vmalloc.h>
 #include <linux/zlib.h>

diff --git a/fs/ntfs/logfile.c b/fs/ntfs/logfile.c
index 761f12f7f3efcfac4b39247589c1797342c62fcc..353379ff6057d9155234fc426960aca584d5dbf2 100644 (file)
--- a/fs/ntfs/logfile.c
+++ b/fs/ntfs/logfile.c
@@ -27,6 +27,7 @@
 #include <linux/buffer_head.h>
 #include <linux/bitops.h>
 #include <linux/log2.h>
+#include <linux/bio.h>
 
 #include "attrib.h"
 #include "aops.h"

diff --git a/fs/ocfs2/buffer_head_io.c b/fs/ocfs2/buffer_head_io.c
index 8f040f88ade44dd7cb85feacd782f3b31d0fac82..d9ebe11c89909b8587fa3d7faa491c75426bed87 100644 (file)
--- a/fs/ocfs2/buffer_head_io.c
+++ b/fs/ocfs2/buffer_head_io.c
@@ -26,6 +26,7 @@
 #include <linux/fs.h>
 #include <linux/types.h>
 #include <linux/highmem.h>
+#include <linux/bio.h>
 
 #include <cluster/masklog.h>
 

diff --git a/fs/orangefs/inode.c b/fs/orangefs/inode.c
index ef3b4eb54cf25d62336afe64b24bf24ce421ecf9..551bc74ed2b822fe0f211d90527397da2d86bb38 100644 (file)
--- a/fs/orangefs/inode.c
+++ b/fs/orangefs/inode.c
@@ -8,6 +8,7 @@
  *  Linux VFS inode operations.
  */
 
+#include <linux/bvec.h>
 #include "protocol.h"
 #include "orangefs-kernel.h"
 #include "orangefs-bufmap.h"

diff --git a/fs/reiserfs/stree.c b/fs/reiserfs/stree.c
index a97e352d05d3b5492b800ab280966d4a00911eab..0037aea97d39a6c73eff9755d805bc2312b552a3 100644 (file)
--- a/fs/reiserfs/stree.c
+++ b/fs/reiserfs/stree.c
@@ -11,6 +11,7 @@
 #include <linux/time.h>
 #include <linux/string.h>
 #include <linux/pagemap.h>
+#include <linux/bio.h>
 #include "reiserfs.h"
 #include <linux/buffer_head.h>
 #include <linux/quotaops.h>

diff --git a/fs/squashfs/block.c b/fs/squashfs/block.c
index ce62a380314f09e036c9468b73812c4fc872676f..2751476e6b6e85e094b33f717093ba0251af999e 100644 (file)
--- a/fs/squashfs/block.c
+++ b/fs/squashfs/block.c
@@ -31,6 +31,7 @@
 #include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/buffer_head.h>
+#include <linux/bio.h>
 
 #include "squashfs_fs.h"
 #include "squashfs_fs_sb.h"

diff --git a/fs/udf/dir.c b/fs/udf/dir.c
index aaec13c952531dc733d31e048d3050f018b40eed..2d0e028067eb91f94126989b75cd0006cea2ed80 100644 (file)
--- a/fs/udf/dir.c
+++ b/fs/udf/dir.c
@@ -30,6 +30,7 @@
 #include <linux/errno.h>
 #include <linux/mm.h>
 #include <linux/slab.h>
+#include <linux/bio.h>
 
 #include "udf_i.h"
 #include "udf_sb.h"

diff --git a/fs/udf/directory.c b/fs/udf/directory.c
index 988d5352bdb866e6108a03d3798492c206b034f9..7aa48bd7cbaf317b2301305137d7d9687bd211e8 100644 (file)
--- a/fs/udf/directory.c
+++ b/fs/udf/directory.c
@@ -16,6 +16,7 @@
 
 #include <linux/fs.h>
 #include <linux/string.h>
+#include <linux/bio.h>
 
 struct fileIdentDesc *udf_fileident_read(struct inode *dir, loff_t *nf_pos,
                                         struct udf_fileident_bh *fibh,

diff --git a/fs/udf/inode.c b/fs/udf/inode.c
index aad46401ede5d881053aac1cb64050adcda60204..0f3db71753aa262f9281257263f845c857aba0e9 100644 (file)
--- a/fs/udf/inode.c
+++ b/fs/udf/inode.c
@@ -38,6 +38,7 @@
 #include <linux/crc-itu-t.h>
 #include <linux/mpage.h>
 #include <linux/uio.h>
+#include <linux/bio.h>
 
 #include "udf_i.h"
 #include "udf_sb.h"

diff --git a/fs/ufs/balloc.c b/fs/ufs/balloc.c
index 67e085d591d8398aaf07ab0102e602b70ca9ae8e..b035af54f538324f7904267228632177fd92fa13 100644 (file)
--- a/fs/ufs/balloc.c
+++ b/fs/ufs/balloc.c
@@ -15,6 +15,7 @@
 #include <linux/buffer_head.h>
 #include <linux/capability.h>
 #include <linux/bitops.h>
+#include <linux/bio.h>
 #include <asm/byteorder.h>
 
 #include "ufs_fs.h"

diff --git a/include/linux/fs.h b/include/linux/fs.h
index 5b0a9b77534d202a04f38112d9139d9cd46ef74f..8533e9d59c29daa0542e5f571427dd1bb9564919 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -28,7 +28,6 @@
 #include <linux/uidgid.h>
 #include <linux/lockdep.h>
 #include <linux/percpu-rwsem.h>
-#include <linux/blk_types.h>
 #include <linux/workqueue.h>
 #include <linux/percpu-rwsem.h>
 #include <linux/delayed_call.h>
@@ -38,6 +37,7 @@
 
 struct backing_dev_info;
 struct bdi_writeback;
+struct bio;
 struct export_operations;
 struct hd_geometry;
 struct iovec;

diff --git a/include/linux/swap.h b/include/linux/swap.h
index a56523cefb9b7b9bdda7ee3ae84b6b5f7c10766c..3a6aebc230015b3520f33b414eb1c1fed33526dd 100644 (file)
--- a/include/linux/swap.h
+++ b/include/linux/swap.h
@@ -11,6 +11,7 @@
 #include <linux/fs.h>
 #include <linux/atomic.h>
 #include <linux/page-flags.h>
+#include <linux/blk_types.h>
 #include <asm/page.h>
 
 struct notifier_block;

diff --git a/include/linux/writeback.h b/include/linux/writeback.h
index 797100e100109756f68a4248390b7ad4dfab0617..e4c38703bf4e5c6efe837c60f64ff66a0a8a4ad3 100644 (file)
--- a/include/linux/writeback.h
+++ b/include/linux/writeback.h
@@ -10,6 +10,8 @@
 #include <linux/flex_proportions.h>
 #include <linux/backing-dev-defs.h>
 
+struct bio;
+
 DECLARE_PER_CPU(int, dirty_throttle_leaks);
 
 /*

diff --git a/lib/iov_iter.c b/lib/iov_iter.c
index f0c7f1481baeefe30f14820ef9a2782a1541a175..efc953c475727489edfb3deca59759b19fbcff07 100644 (file)
--- a/lib/iov_iter.c
+++ b/lib/iov_iter.c
@@ -1,4 +1,5 @@
 #include <linux/export.h>
+#include <linux/bvec.h>
 #include <linux/uio.h>
 #include <linux/pagemap.h>
 #include <linux/slab.h>