block: move ioprio.c from fs/ to block/

Like commit f9c78b2b, move this block related file outside
of fs/ and into the core block directory, block/.

Signed-off-by: Jens Axboe <axboe@fb.com>

diff --git a/block/Makefile b/block/Makefile
index 506a0c570be222e0dbde9b0cff1b49dac3cfee53..b4c4d3b99a2dd8ae75cc95c843e0ecec39415514 100644 (file)
--- a/block/Makefile
+++ b/block/Makefile
@@ -7,7 +7,8 @@ obj-$(CONFIG_BLOCK) := bio.o elevator.o blk-core.o blk-tag.o blk-sysfs.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 \
                        blk-mq-sysfs.o blk-mq-cpu.o blk-mq-cpumap.o ioctl.o \
-                       genhd.o scsi_ioctl.o partition-generic.o partitions/
+                       genhd.o scsi_ioctl.o partition-generic.o ioprio.o \
+                       partitions/
 
 obj-$(CONFIG_BLK_DEV_BSG)      += bsg.o
 obj-$(CONFIG_BLK_DEV_BSGLIB)   += bsg-lib.o

diff --git a/fs/ioprio.c b/block/ioprio.c
similarity index 100%
rename from fs/ioprio.c
rename to block/ioprio.c

diff --git a/fs/Makefile b/fs/Makefile
index 1ed9eab5e0a96c547e01f51e18b0b2dfadb18737..4030cbfbc9af8572673eb06c997603ee529443e4 100644 (file)
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -14,7 +14,7 @@ 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 block_dev.o direct-io.o mpage.o ioprio.o
+obj-y +=       buffer.o block_dev.o direct-io.o mpage.o
 else
 obj-y +=       no-block.o
 endif