diff options
| author | Christoph Hellwig <hch@infradead.org> | 2014-02-10 03:24:38 -0800 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2014-02-10 09:27:31 -0700 |
| commit | 30a91cb4ef385fe1b260df204ef314d86fff2850 (patch) | |
| tree | 97ecc925cb7868f456d5dd3219980be5dc01d900 /block/blk-timeout.c | |
| parent | c4540a7d8c1e595560e53acedf88901daf15a2b5 (diff) | |
| download | linux-stable-30a91cb4ef385fe1b260df204ef314d86fff2850.tar.gz linux-stable-30a91cb4ef385fe1b260df204ef314d86fff2850.tar.bz2 linux-stable-30a91cb4ef385fe1b260df204ef314d86fff2850.zip | |
blk-mq: rework I/O completions
Rework I/O completions to work more like the old code path. blk_mq_end_io
now stays out of the business of deferring completions to others CPUs
and calling blk_mark_rq_complete. The latter is very important to allow
completing requests that have timed out and thus are already marked completed,
the former allows using the IPI callout even for driver specific completions
instead of having to reimplement them.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'block/blk-timeout.c')
| -rw-r--r-- | block/blk-timeout.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-timeout.c b/block/blk-timeout.c index bba81c9348e1..d96f7061c6fd 100644 --- a/block/blk-timeout.c +++ b/block/blk-timeout.c @@ -91,7 +91,7 @@ static void blk_rq_timed_out(struct request *req) case BLK_EH_HANDLED: /* Can we use req->errors here? */ if (q->mq_ops) - blk_mq_complete_request(req, req->errors); + __blk_mq_complete_request(req); else __blk_complete_request(req); break; |