diff options
| author | Jens Axboe <axboe@fb.com> | 2014-05-19 11:02:18 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2014-05-19 11:02:18 -0600 |
| commit | 2667bcbbd5ed71f29b78ba69f059dbc450e07faf (patch) | |
| tree | 8cdb8f35211c4cac730547331de7b6f87f29bb6d | |
| parent | f9c78b2be2cac2a7a397d489275e7d9f9ae785f2 (diff) | |
| download | linux-stable-2667bcbbd5ed71f29b78ba69f059dbc450e07faf.tar.gz linux-stable-2667bcbbd5ed71f29b78ba69f059dbc450e07faf.tar.bz2 linux-stable-2667bcbbd5ed71f29b78ba69f059dbc450e07faf.zip | |
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>
| -rw-r--r-- | block/Makefile | 3 | ||||
| -rw-r--r-- | block/ioprio.c (renamed from fs/ioprio.c) | 0 | ||||
| -rw-r--r-- | fs/Makefile | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/block/Makefile b/block/Makefile index 506a0c570be2..b4c4d3b99a2d 100644 --- 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 index e50170ca7c33..e50170ca7c33 100644 --- a/fs/ioprio.c +++ b/block/ioprio.c diff --git a/fs/Makefile b/fs/Makefile index 1ed9eab5e0a9..4030cbfbc9af 100644 --- 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 |