diff options
| author | Christoph Hellwig <hch@lst.de> | 2018-06-19 18:40:14 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2018-06-19 19:27:18 +0200 |
| commit | 0cc61e64e21cfc24fa0d938fd148aba4a595163b (patch) | |
| tree | 51eab03835e134bfc48d588ea268d1580ebfd3d3 /block/blk-softirq.c | |
| parent | bsg: fix race of bsg_open and bsg_unregister (diff) | |
| download | linux-0cc61e64e21cfc24fa0d938fd148aba4a595163b.tar.xz linux-0cc61e64e21cfc24fa0d938fd148aba4a595163b.zip | |
block: fix timeout changes for legacy request drivers
blk_mq_complete_request can only be called for blk-mq drivers, but when
removing the BLK_EH_HANDLED return value, two legacy request timeout
methods incorrectly got switched to call blk_mq_complete_request.
Call __blk_complete_request instead to reinstance the previous behavior.
For that __blk_complete_request needs to be exported.
Fixes: 1fc2b62e ("scsi_transport_fc: complete requests from ->timeout")
Fixes: 0df0bb08 ("null_blk: complete requests from ->timeout")
Reported-by: Jianchao Wang <jianchao.w.wang@oracle.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/blk-softirq.c')
| -rw-r--r-- | block/blk-softirq.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/block/blk-softirq.c b/block/blk-softirq.c index 01e2b353a2b9..15c1f5e12eb8 100644 --- a/block/blk-softirq.c +++ b/block/blk-softirq.c @@ -144,6 +144,7 @@ do_local: local_irq_restore(flags); } +EXPORT_SYMBOL(__blk_complete_request); /** * blk_complete_request - end I/O on a request |