Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f9c78b2b authored May 19, 2014 by Jens Axboe

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>

parent acb12e0a

block/Makefile

+2 −1

Original line number	Diff line number	Diff line
		@@ -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

fs/bio-integrity.c→block/bio-integrity.c

+0 −0

File moved.

fs/bio.c→block/bio.c

+0 −0

File moved.

fs/Makefile

+1 −2

Original line number	Diff line number	Diff line
		@@ -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