Skip to content

Commit f382fb0

Browse files
committed
block: remove legacy IO schedulers
Retain the deadline documentation, as that carries over to mq-deadline as well. Tested-by: Ming Lei <ming.lei@redhat.com> Reviewed-by: Omar Sandoval <osandov@fb.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
1 parent 404b8f5 commit f382fb0

File tree

7 files changed

+0
-6025
lines changed

7 files changed

+0
-6025
lines changed

Documentation/block/cfq-iosched.txt

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

block/Kconfig.iosched

Lines changed: 0 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -3,67 +3,6 @@ if BLOCK
33

44
menu "IO Schedulers"
55

6-
config IOSCHED_NOOP
7-
bool
8-
default y
9-
---help---
10-
The no-op I/O scheduler is a minimal scheduler that does basic merging
11-
and sorting. Its main uses include non-disk based block devices like
12-
memory devices, and specialised software or hardware environments
13-
that do their own scheduling and require only minimal assistance from
14-
the kernel.
15-
16-
config IOSCHED_DEADLINE
17-
tristate "Deadline I/O scheduler"
18-
default y
19-
---help---
20-
The deadline I/O scheduler is simple and compact. It will provide
21-
CSCAN service with FIFO expiration of requests, switching to
22-
a new point in the service tree and doing a batch of IO from there
23-
in case of expiry.
24-
25-
config IOSCHED_CFQ
26-
tristate "CFQ I/O scheduler"
27-
default y
28-
---help---
29-
The CFQ I/O scheduler tries to distribute bandwidth equally
30-
among all processes in the system. It should provide a fair
31-
and low latency working environment, suitable for both desktop
32-
and server systems.
33-
34-
This is the default I/O scheduler.
35-
36-
config CFQ_GROUP_IOSCHED
37-
bool "CFQ Group Scheduling support"
38-
depends on IOSCHED_CFQ && BLK_CGROUP
39-
---help---
40-
Enable group IO scheduling in CFQ.
41-
42-
choice
43-
44-
prompt "Default I/O scheduler"
45-
default DEFAULT_CFQ
46-
help
47-
Select the I/O scheduler which will be used by default for all
48-
block devices.
49-
50-
config DEFAULT_DEADLINE
51-
bool "Deadline" if IOSCHED_DEADLINE=y
52-
53-
config DEFAULT_CFQ
54-
bool "CFQ" if IOSCHED_CFQ=y
55-
56-
config DEFAULT_NOOP
57-
bool "No-op"
58-
59-
endchoice
60-
61-
config DEFAULT_IOSCHED
62-
string
63-
default "deadline" if DEFAULT_DEADLINE
64-
default "cfq" if DEFAULT_CFQ
65-
default "noop" if DEFAULT_NOOP
66-
676
config MQ_IOSCHED_DEADLINE
687
tristate "MQ deadline I/O scheduler"
698
default y

block/Makefile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@ obj-$(CONFIG_BLK_DEV_BSGLIB) += bsg-lib.o
1818
obj-$(CONFIG_BLK_CGROUP) += blk-cgroup.o
1919
obj-$(CONFIG_BLK_DEV_THROTTLING) += blk-throttle.o
2020
obj-$(CONFIG_BLK_CGROUP_IOLATENCY) += blk-iolatency.o
21-
obj-$(CONFIG_IOSCHED_NOOP) += noop-iosched.o
22-
obj-$(CONFIG_IOSCHED_DEADLINE) += deadline-iosched.o
23-
obj-$(CONFIG_IOSCHED_CFQ) += cfq-iosched.o
2421
obj-$(CONFIG_MQ_IOSCHED_DEADLINE) += mq-deadline.o
2522
obj-$(CONFIG_MQ_IOSCHED_KYBER) += kyber-iosched.o
2623
bfq-y := bfq-iosched.o bfq-wf2q.o bfq-cgroup.o

0 commit comments

Comments
 (0)