.. | .. |
---|
23 | 23 | int tag) |
---|
24 | 24 | { |
---|
25 | 25 | struct request *req = NULL; |
---|
| 26 | + u16 hwq; |
---|
26 | 27 | |
---|
27 | 28 | if (tag == SCSI_NO_TAG) |
---|
28 | 29 | return NULL; |
---|
29 | 30 | |
---|
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)); |
---|
39 | 35 | } |
---|
40 | 36 | |
---|
41 | | - if (!req) |
---|
| 37 | + if (!req || !blk_mq_request_started(req)) |
---|
42 | 38 | return NULL; |
---|
43 | 39 | return blk_mq_rq_to_pdu(req); |
---|
44 | 40 | } |
---|