Commit a1ce35fa49852db60fc6e268038530be533c5b15 ("block: remove dead
elevator code") removed all users of RQF_SORTED. However it is still
defined, and there is one reference left to it (which in effect is
dead code). Clear it all up.
Signed-off-by: Jean Delvare <jdelvare@xxxxxxx>
Cc: Jens Axboe <axboe@xxxxxxxxx>
Cc: Ming Lei <ming.lei@xxxxxxxxxx>
Cc: Omar Sandoval <osandov@xxxxxx>
Cc: Hannes Reinecke <hare@xxxxxxxx>
---
Changes since v1:
* Remove parameter "has_sched" as it is no longer used. Spotted by
Jens Axboe.
block/blk-mq-debugfs.c | 1 -
block/blk-mq-sched.c | 6 +-----
include/linux/blkdev.h | 2 --
3 files changed, 1 insertion(+), 8 deletions(-)
--- linux-5.11.orig/block/blk-mq-sched.c 2021-03-01 12:05:12.991065582 +0100
+++ linux-5.11/block/blk-mq-sched.c 2021-03-01 17:07:12.914456908 +0100
@@ -391,7 +391,6 @@ void blk_mq_sched_request_inserted(struc
EXPORT_SYMBOL_GPL(blk_mq_sched_request_inserted);
static bool blk_mq_sched_bypass_insert(struct blk_mq_hw_ctx *hctx,
- bool has_sched,
struct request *rq)
{
/*
@@ -408,9 +407,6 @@ static bool blk_mq_sched_bypass_insert(s
if ((rq->rq_flags & RQF_FLUSH_SEQ) || blk_rq_is_passthrough(rq))
return true;
- if (has_sched)
- rq->rq_flags |= RQF_SORTED;
-
return false;
}
@@ -424,7 +420,7 @@ void blk_mq_sched_insert_request(struct
WARN_ON(e && (rq->tag != BLK_MQ_NO_TAG));
- if (blk_mq_sched_bypass_insert(hctx, !!e, rq)) {
+ if (blk_mq_sched_bypass_insert(hctx, rq)) {
/*
* Firstly normal IO request is inserted to scheduler queue or
* sw queue, meantime we add flush request to dispatch queue(
--- linux-5.11.orig/include/linux/blkdev.h 2021-03-01 12:05:12.991065582 +0100
+++ linux-5.11/include/linux/blkdev.h 2021-03-01 12:05:32.395297133 +0100
@@ -65,8 +65,6 @@ typedef void (rq_end_io_fn)(struct reque
* request flags */
typedef __u32 __bitwise req_flags_t;
-/* elevator knows about this request */
-#define RQF_SORTED ((__force req_flags_t)(1 << 0))
/* drive already may have started this one */
#define RQF_STARTED ((__force req_flags_t)(1 << 1))
/* may not be passed by ioscheduler */
--- linux-5.11.orig/block/blk-mq-debugfs.c 2021-03-01 12:05:12.991065582 +0100
+++ linux-5.11/block/blk-mq-debugfs.c 2021-03-01 12:05:32.395297133 +0100
@@ -292,7 +292,6 @@ static const char *const cmd_flag_name[]
#define RQF_NAME(name) [ilog2((__force u32)RQF_##name)] = #name
static const char *const rqf_name[] = {
- RQF_NAME(SORTED),
RQF_NAME(STARTED),
RQF_NAME(SOFTBARRIER),
RQF_NAME(FLUSH_SEQ),
--
Jean Delvare
SUSE L3 Support
