Commit 35ed78b3 authored Mar 09, 2020 by Guoqing Jiang Committed by Jens Axboe Mar 12, 2020

block: use bio_{wouldblock,io}_error in direct_make_request



Use the two functions to simplify code.

Signed-off-by: Guoqing Jiang <guoqing.jiang@cloud.ionos.com>
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

parent 0d720318

block/blk-core.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -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;
		}

Admin message