On 3/1/21 4:04 AM, Jean Delvare wrote:
> 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>
> ---
> block/blk-mq-debugfs.c | 1 -
> block/blk-mq-sched.c | 3 ---
> include/linux/blkdev.h | 2 --
> 3 files changed, 6 deletions(-)
>
> --- linux-5.11.orig/block/blk-mq-sched.c 2021-02-14 23:32:24.000000000 +0100
> +++ linux-5.11/block/blk-mq-sched.c 2021-03-01 11:06:49.629077653 +0100
> @@ -408,9 +408,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;
> }
Since that's the only reason why we are passing in 'has_sched', you should
kill that argument as well from the function and the single caller.
--
Jens Axboe
