UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

null_blk: complete requests from ->timeout 

By completing the request entirely in the driver we can remove the
BLK_EH_HANDLED return value and thus the split responsibility between the
driver and the block layer that has been causing trouble.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Christoph Hellwig 2018-05-29 15:52:33 +02:00 committed by Jens Axboe
parent c5fb85b7ff
commit 0df0bb080a
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/block/null_blk.c
View File

@ -1365,7 +1365,8 @@ 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) static enum blk_eh_timer_return null_rq_timed_out_fn(struct request *rq)
{ {
pr_info("null: rq %p timed out\n", rq); pr_info("null: rq %p timed out\n", rq);
return BLK_EH_HANDLED; blk_mq_complete_request(rq);
return BLK_EH_DONE;
} }
static int null_rq_prep_fn(struct request_queue *q, struct request *req) static int null_rq_prep_fn(struct request_queue *q, struct request *req)
@ -1427,7 +1428,8 @@ static void null_request_fn(struct request_queue *q)
static enum blk_eh_timer_return null_timeout_rq(struct request *rq, bool res) static enum blk_eh_timer_return null_timeout_rq(struct request *rq, bool res)
{ {
pr_info("null: rq %p timed out\n", rq); pr_info("null: rq %p timed out\n", rq);
return BLK_EH_HANDLED; blk_mq_complete_request(rq);
return BLK_EH_DONE;
} }
static blk_status_t null_queue_rq(struct blk_mq_hw_ctx *hctx, static blk_status_t null_queue_rq(struct blk_mq_hw_ctx *hctx,