Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0cc61e64 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

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: default avatarJianchao Wang <jianchao.w.wang@oracle.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent d6c73964

block/blk-softirq.c

+1 −0
Original line number Diff line number Diff line
@@ -144,6 +144,7 @@ void __blk_complete_request(struct request *req) 


	local_irq_restore(flags);

}

EXPORT_SYMBOL(__blk_complete_request);



/**

 * blk_complete_request - end I/O on a request

drivers/block/null_blk.c

+1 −1
Original line number Diff line number Diff line
@@ -1365,7 +1365,7 @@ static blk_qc_t null_queue_bio(struct request_queue *q, struct bio *bio) 
static enum blk_eh_timer_return null_rq_timed_out_fn(struct request *rq)

{

	pr_info("null: rq %p timed out\n", rq);

	blk_mq_complete_request(rq);

	__blk_complete_request(rq);

	return BLK_EH_DONE;

}

drivers/scsi/scsi_transport_fc.c

+1 −1
Original line number Diff line number Diff line
@@ -3592,7 +3592,7 @@ fc_bsg_job_timeout(struct request *req) 


	/* the blk_end_sync_io() doesn't check the error */

	if (inflight)

		blk_mq_complete_request(req);

		__blk_complete_request(req);

	return BLK_EH_DONE;

}