diff options
| author | Christoph Hellwig <hch@lst.de> | 2020-06-11 08:44:47 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2020-06-24 17:15:57 +0200 |
| commit | 15f73f5b3e5958f2d169fe13c420eeeeae07bbf2 (patch) | |
| tree | da4308ed35371e693bb35b85855e2f984aa465b2 /block/bsg-lib.c | |
| parent | blk-mq: merge the softirq vs non-softirq IPI logic (diff) | |
| download | linux-15f73f5b3e5958f2d169fe13c420eeeeae07bbf2.tar.xz linux-15f73f5b3e5958f2d169fe13c420eeeeae07bbf2.zip | |
blk-mq: move failure injection out of blk_mq_complete_request
Move the call to blk_should_fake_timeout out of blk_mq_complete_request
and into the drivers, skipping call sites that are obvious error
handlers, and remove the now superflous blk_mq_force_complete_rq helper.
This ensures we don't keep injecting errors into completions that just
terminate the Linux request after the hardware has been reset or the
command has been aborted.
Reviewed-by: Daniel Wagner <dwagner@suse.de>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/bsg-lib.c')
| -rw-r--r-- | block/bsg-lib.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/block/bsg-lib.c b/block/bsg-lib.c index 6cbb7926534c..fb7b347f8010 100644 --- a/block/bsg-lib.c +++ b/block/bsg-lib.c @@ -181,9 +181,12 @@ EXPORT_SYMBOL_GPL(bsg_job_get); void bsg_job_done(struct bsg_job *job, int result, unsigned int reply_payload_rcv_len) { + struct request *rq = blk_mq_rq_from_pdu(job); + job->result = result; job->reply_payload_rcv_len = reply_payload_rcv_len; - blk_mq_complete_request(blk_mq_rq_from_pdu(job)); + if (likely(!blk_should_fake_timeout(rq->q))) + blk_mq_complete_request(rq); } EXPORT_SYMBOL_GPL(bsg_job_done); |