Skip to content

Commit 0f78399

Browse files
htejunaxboe
authored andcommitted
Revert "block/mq-deadline: Add cgroup support"
This reverts commit 08a9ad8 ("block/mq-deadline: Add cgroup support") and a follow-up commit c06bc5a ("block/mq-deadline: Remove a WARN_ON_ONCE() call"). The added cgroup support has the following issues: * It breaks cgroup interface file format rule by adding custom elements to a nested key-value file. * It registers mq-deadline as a cgroup-aware policy even though all it's doing is collecting per-cgroup stats. Even if we need these stats, this isn't the right way to add them. * It hasn't been reviewed from cgroup side. Cc: Bart Van Assche <[email protected]> Cc: Jens Axboe <[email protected]> Signed-off-by: Tejun Heo <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
1 parent 11431e2 commit 0f78399

File tree

5 files changed

+14
-307
lines changed

5 files changed

+14
-307
lines changed

block/Kconfig.iosched

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,6 @@ config MQ_IOSCHED_DEADLINE
99
help
1010
MQ version of the deadline IO scheduler.
1111

12-
config MQ_IOSCHED_DEADLINE_CGROUP
13-
tristate
14-
default y
15-
depends on MQ_IOSCHED_DEADLINE
16-
depends on BLK_CGROUP
17-
1812
config MQ_IOSCHED_KYBER
1913
tristate "Kyber I/O scheduler"
2014
default y

block/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ obj-$(CONFIG_BLK_CGROUP_IOPRIO) += blk-ioprio.o
2222
obj-$(CONFIG_BLK_CGROUP_IOLATENCY) += blk-iolatency.o
2323
obj-$(CONFIG_BLK_CGROUP_IOCOST) += blk-iocost.o
2424
obj-$(CONFIG_MQ_IOSCHED_DEADLINE) += mq-deadline.o
25-
mq-deadline-y += mq-deadline-main.o
26-
mq-deadline-$(CONFIG_MQ_IOSCHED_DEADLINE_CGROUP)+= mq-deadline-cgroup.o
2725
obj-$(CONFIG_MQ_IOSCHED_KYBER) += kyber-iosched.o
2826
bfq-y := bfq-iosched.o bfq-wf2q.o bfq-cgroup.o
2927
obj-$(CONFIG_IOSCHED_BFQ) += bfq.o

block/mq-deadline-cgroup.c

Lines changed: 0 additions & 126 deletions
This file was deleted.

block/mq-deadline-cgroup.h

Lines changed: 0 additions & 114 deletions
This file was deleted.

0 commit comments

Comments
 (0)