diff options
author | Christoph Hellwig <hch@lst.de> | 2016-11-01 07:40:13 -0600 |
---|---|---|
committer | Jens Axboe <axboe@fb.com> | 2016-11-01 09:43:26 -0600 |
commit | 2f8b544477e627a42e66902e948d87f86554aeca (patch) | |
tree | 6bd32bb26fa8c3bbcef14ed4df1bed0f664d3490 /include | |
parent | 1e3914d4cf4e14653b7917b0e965217465cb7a9c (diff) | |
download | blackbird-op-linux-2f8b544477e627a42e66902e948d87f86554aeca.tar.gz blackbird-op-linux-2f8b544477e627a42e66902e948d87f86554aeca.zip |
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>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/fs.h | 2 | ||||
-rw-r--r-- | include/linux/swap.h | 1 | ||||
-rw-r--r-- | include/linux/writeback.h | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index 5b0a9b77534d..8533e9d59c29 100644 --- 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 a56523cefb9b..3a6aebc23001 100644 --- 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 797100e10010..e4c38703bf4e 100644 --- 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); /* |