Commit 5218e12e authored by Jean Delvare's avatar Jean Delvare Committed by Jens Axboe
Browse files

block: Drop leftover references to RQF_SORTED 



Commit a1ce35fa ("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: default avatarJean Delvare <jdelvare@suse.de>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Ming Lei <ming.lei@redhat.com>
Cc: Omar Sandoval <osandov@fb.com>
Cc: Hannes Reinecke <hare@suse.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 0f472277

block/blk-mq-debugfs.c

+0 −1
Original line number Diff line number Diff line
@@ -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),

block/blk-mq-sched.c

+1 −5
Original line number Diff line number Diff line
@@ -385,7 +385,6 @@ bool blk_mq_sched_try_insert_merge(struct request_queue *q, struct request *rq) 
EXPORT_SYMBOL_GPL(blk_mq_sched_try_insert_merge);



static bool blk_mq_sched_bypass_insert(struct blk_mq_hw_ctx *hctx,

				       bool has_sched,

				       struct request *rq)

{

	/*
@@ -402,9 +401,6 @@ static bool blk_mq_sched_bypass_insert(struct blk_mq_hw_ctx *hctx, 
	if ((rq->rq_flags & RQF_FLUSH_SEQ) || blk_rq_is_passthrough(rq))

		return true;



	if (has_sched)

		rq->rq_flags |= RQF_SORTED;



	return false;

}
@@ -418,7 +414,7 @@ void blk_mq_sched_insert_request(struct request *rq, bool at_head, 


	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(

include/linux/blkdev.h

+0 −2
Original line number Diff line number Diff line
@@ -65,8 +65,6 @@ typedef void (rq_end_io_fn)(struct request *, blk_status_t); 
 * 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 */