hc
2023-12-09 b22da3d8526a935aa31e086e63f60ff3246cb61c
kernel/include/scsi/scsi_tcq.h
....@@ -23,22 +23,18 @@
2323 int tag)
2424 {
2525 struct request *req = NULL;
26
+ u16 hwq;
2627
2728 if (tag == SCSI_NO_TAG)
2829 return NULL;
2930
30
- if (shost_use_blk_mq(shost)) {
31
- u16 hwq = blk_mq_unique_tag_to_hwq(tag);
32
-
33
- if (hwq < shost->tag_set.nr_hw_queues) {
34
- req = blk_mq_tag_to_rq(shost->tag_set.tags[hwq],
35
- blk_mq_unique_tag_to_tag(tag));
36
- }
37
- } else {
38
- req = blk_map_queue_find_tag(shost->bqt, tag);
31
+ hwq = blk_mq_unique_tag_to_hwq(tag);
32
+ if (hwq < shost->tag_set.nr_hw_queues) {
33
+ req = blk_mq_tag_to_rq(shost->tag_set.tags[hwq],
34
+ blk_mq_unique_tag_to_tag(tag));
3935 }
4036
41
- if (!req)
37
+ if (!req || !blk_mq_request_started(req))
4238 return NULL;
4339 return blk_mq_rq_to_pdu(req);
4440 }