Instead of setting the REQ_QUEUED flag on each of them just take it into account in the only macro checking it.
Unified · Split
| @@ -1101,7 +1101,8 @@ static inline bool blk_needs_flush_plug(struct task_struct *tsk) · 1100 unmodified lines | ||
| 1101 | 1101 | /* |
| 1102 | 1102 | * tag stuff |
| 1103 | 1103 | */ |
| 1104 | −#define blk_rq_tagged(rq) ((rq)->cmd_flags & REQ_QUEUED) | |
| 1104 | +#define blk_rq_tagged(rq) \ | |
| 1105 | + ((rq)->mq_ctx || ((rq)->cmd_flags & REQ_QUEUED)) | |
| 1105 | 1106 | extern int blk_queue_start_tag(struct request_queue *, struct request *); |
| 1106 | 1107 | extern struct request *blk_queue_find_tag(struct request_queue *, int); |
| 1107 | 1108 | extern void blk_queue_end_tag(struct request_queue *, struct request *); |