summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJens Axboe <axboe@fb.com>2014-05-19 08:16:41 -0600
committerJens Axboe <axboe@fb.com>2014-05-19 08:34:46 -0600
commitf9c78b2be2cac2a7a397d489275e7d9f9ae785f2 (patch)
treefde918d944e61dc87cc89a71bec7e886832b1829
parentacb12e0a9c17ae859a05acb116a0c0a7e310c781 (diff)
downloadlinux-f9c78b2be2cac2a7a397d489275e7d9f9ae785f2.tar.bz2
block: move bio.c and bio-integrity.c from fs/ to block/
They really belong in block/, especially now since it's not in drivers/block/ anymore. Additionally, the get_maintainer script gets it wrong when in fs/. Suggested-by: Christoph Hellwig <hch@infradead.org> Acked-by: Al Viro <viro@ZenIV.linux.org.uk> Signed-off-by: Jens Axboe <axboe@fb.com>
-rw-r--r--block/Makefile3
-rw-r--r--block/bio-integrity.c (renamed from fs/bio-integrity.c)0
-rw-r--r--block/bio.c (renamed from fs/bio.c)0
-rw-r--r--fs/Makefile3
4 files changed, 3 insertions, 3 deletions
diff --git a/block/Makefile b/block/Makefile
index 20645e88fb57..506a0c570be2 100644
--- a/block/Makefile
+++ b/block/Makefile
@@ -2,7 +2,7 @@
# Makefile for the kernel block layer
#
-obj-$(CONFIG_BLOCK) := elevator.o blk-core.o blk-tag.o blk-sysfs.o \
+obj-$(CONFIG_BLOCK) := bio.o elevator.o blk-core.o blk-tag.o blk-sysfs.o \
blk-flush.o blk-settings.o blk-ioc.o blk-map.o \
blk-exec.o blk-merge.o blk-softirq.o blk-timeout.o \
blk-iopoll.o blk-lib.o blk-mq.o blk-mq-tag.o \
@@ -20,3 +20,4 @@ obj-$(CONFIG_IOSCHED_CFQ) += cfq-iosched.o
obj-$(CONFIG_BLOCK_COMPAT) += compat_ioctl.o
obj-$(CONFIG_BLK_DEV_INTEGRITY) += blk-integrity.o
obj-$(CONFIG_BLK_CMDLINE_PARSER) += cmdline-parser.o
+obj-$(CONFIG_BLK_DEV_INTEGRITY) += bio-integrity.o
diff --git a/fs/bio-integrity.c b/block/bio-integrity.c
index 9e241063a616..9e241063a616 100644
--- a/fs/bio-integrity.c
+++ b/block/bio-integrity.c
diff --git a/fs/bio.c b/block/bio.c
index 96d28eee8a1e..96d28eee8a1e 100644
--- a/fs/bio.c
+++ b/block/bio.c
diff --git a/fs/Makefile b/fs/Makefile
index f9cb9876e466..1ed9eab5e0a9 100644
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -14,14 +14,13 @@ obj-y := open.o read_write.o file_table.o super.o \
stack.o fs_struct.o statfs.o
ifeq ($(CONFIG_BLOCK),y)
-obj-y += buffer.o bio.o block_dev.o direct-io.o mpage.o ioprio.o
+obj-y += buffer.o block_dev.o direct-io.o mpage.o ioprio.o
else
obj-y += no-block.o
endif
obj-$(CONFIG_PROC_FS) += proc_namespace.o
-obj-$(CONFIG_BLK_DEV_INTEGRITY) += bio-integrity.o
obj-y += notify/
obj-$(CONFIG_EPOLL) += eventpoll.o
obj-$(CONFIG_ANON_INODES) += anon_inodes.o