[PATCH] block: elevator: remove dead elevator code
From: Jackie Liu <hidden>
Date: 2021-04-14 09:59:03
Subsystem:
block layer, the rest · Maintainers:
Jens Axboe, Linus Torvalds
Since a1ce35fa4985 ("block: remove dead elevator code") we droped
ELEVATOR_INSERT_SORT, ELEVATOR_INSERT_BACK and so on.
After f382fb0bcef4 ("block: remove legacy IO schedulers") we droped
rq_end_sector(rq) use.
After f382fb0bcef4 ("block: remove legacy IO schedulers") we droped
rq_fifo_clear(rq) use.
Signed-off-by: Jackie Liu <redacted>
---
block/blk-flush.c | 5 -----
include/linux/elevator.h | 13 -------------
2 files changed, 18 deletions(-)
diff --git a/block/blk-flush.c b/block/blk-flush.c
index 7942ca6ed321..0cba5bb2c5e0 100644
--- a/block/blk-flush.c
+++ b/block/blk-flush.c@@ -361,11 +361,6 @@ static void mq_flush_data_end_io(struct request *rq, blk_status_t error) /** * blk_insert_flush - insert a new PREFLUSH/FUA request * @rq: request to insert - * - * To be called from __elv_add_request() for %ELEVATOR_INSERT_FLUSH insertions. - * or __blk_mq_run_hw_queue() to dispatch request. - * @rq is being submitted. Analyze what needs to be done and put it on the - * right queue. */ void blk_insert_flush(struct request *rq) {
diff --git a/include/linux/elevator.h b/include/linux/elevator.h
index 1fe8e105b83b..727f74ae77c8 100644
--- a/include/linux/elevator.h
+++ b/include/linux/elevator.h@@ -150,21 +150,8 @@ extern void elv_rb_add(struct rb_root *, struct request *); extern void elv_rb_del(struct rb_root *, struct request *); extern struct request *elv_rb_find(struct rb_root *, sector_t); -/* - * Insertion selection - */ -#define ELEVATOR_INSERT_FRONT 1 -#define ELEVATOR_INSERT_BACK 2 -#define ELEVATOR_INSERT_SORT 3 -#define ELEVATOR_INSERT_REQUEUE 4 -#define ELEVATOR_INSERT_FLUSH 5 -#define ELEVATOR_INSERT_SORT_MERGE 6 - -#define rq_end_sector(rq) (blk_rq_pos(rq) + blk_rq_sectors(rq)) #define rb_entry_rq(node) rb_entry((node), struct request, rb_node) - #define rq_entry_fifo(ptr) list_entry((ptr), struct request, queuelist) -#define rq_fifo_clear(rq) list_del_init(&(rq)->queuelist) /* * Elevator features.
--
2.25.1