From: Guoqing Jiang Date: Mon, 9 Mar 2020 21:41:34 +0000 (+0100) Subject: block: use bio_{wouldblock,io}_error in direct_make_request X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=35ed78b32cbbb6499b82e7a3a6769fa14e4b3c92;p=linux.git block: use bio_{wouldblock,io}_error in direct_make_request Use the two functions to simplify code. Signed-off-by: Guoqing Jiang Reviewed-by: Nikolay Borisov Reviewed-by: Bart Van Assche Reviewed-by: Chaitanya Kulkarni Signed-off-by: Jens Axboe --- diff --git a/block/blk-core.c b/block/blk-core.c index e26341aa2e3af..9a78f62285f98 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -1121,10 +1121,9 @@ blk_qc_t direct_make_request(struct bio *bio) if (unlikely(blk_queue_enter(q, nowait ? BLK_MQ_REQ_NOWAIT : 0))) { if (nowait && !blk_queue_dying(q)) - bio->bi_status = BLK_STS_AGAIN; + bio_wouldblock_error(bio); else - bio->bi_status = BLK_STS_IOERR; - bio_endio(bio); + bio_io_error(bio); return BLK_QC_T_NONE; }