block: fix timeout changes for legacy request drivers
authorChristoph Hellwig <hch@lst.de>
Tue, 19 Jun 2018 16:40:14 +0000 (18:40 +0200)
committerJens Axboe <axboe@kernel.dk>
Tue, 19 Jun 2018 17:27:18 +0000 (11:27 -0600)
commit0cc61e64e21cfc24fa0d938fd148aba4a595163b
tree51eab03835e134bfc48d588ea268d1580ebfd3d3
parentd6c73964f1e2a07f75057fb32ae46f6599036f93
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>
block/blk-softirq.c
drivers/block/null_blk.c
drivers/scsi/scsi_transport_fc.c