block: get rid of blk_queued_rq()

axboe · axboe · commit 7d692330e7cd · 2018-11-07T13:42:33.000-07:00
No point in hiding what this does, just open code it in the
one spot where we are still using it.

Reviewed-by: Hannes Reinecke &lt;hare@suse.com&gt;
Tested-by: Ming Lei &lt;ming.lei@redhat.com&gt;
Reviewed-by: Omar Sandoval &lt;osandov@fb.com&gt;
Signed-off-by: Jens Axboe &lt;axboe@kernel.dk&gt;
diff --git a/block/blk-mq.c b/block/blk-mq.c
@@ -692,7 +692,7 @@ void blk_mq_requeue_request(struct request *rq, bool kick_requeue_list)
 	/* this request will be re-inserted to io scheduler queue */
 	blk_mq_sched_requeue_request(rq);
 
-	BUG_ON(blk_queued_rq(rq));
+	BUG_ON(!list_empty(&rq->queuelist));
 	blk_mq_add_to_requeue_list(rq, true, kick_requeue_list);
 }
 EXPORT_SYMBOL(blk_mq_requeue_request);
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
@@ -673,8 +673,6 @@ static inline bool blk_account_rq(struct request *rq)
 
 #define blk_rq_cpu_valid(rq)	((rq)->cpu != -1)
 #define blk_bidi_rq(rq)		((rq)->next_rq != NULL)
-/* rq->queuelist of dequeued request must be list_empty() */
-#define blk_queued_rq(rq)	(!list_empty(&(rq)->queuelist))
 
 #define list_entry_rq(ptr)	list_entry((ptr), struct request, queuelist)
 

Original file line number	Diff line number	Diff line change
`@@ -692,7 +692,7 @@ void blk_mq_requeue_request(struct request *rq, bool kick_requeue_list)`
`692`	`692`	`/* this request will be re-inserted to io scheduler queue */`
`693`	`693`	`blk_mq_sched_requeue_request(rq);`
`694`	`694`
`695`		`- BUG_ON(blk_queued_rq(rq));`
	`695`	`+ BUG_ON(!list_empty(&rq->queuelist));`
`696`	`696`	`blk_mq_add_to_requeue_list(rq, true, kick_requeue_list);`
`697`	`697`	`}`
`698`	`698`	`EXPORT_SYMBOL(blk_mq_requeue_request);`