block: use bio_{wouldblock,io}_error in direct_make_request
authorGuoqing Jiang <guoqing.jiang@cloud.ionos.com>
Mon, 9 Mar 2020 21:41:34 +0000 (22:41 +0100)
committerJens Axboe <axboe@kernel.dk>
Thu, 12 Mar 2020 13:42:54 +0000 (07:42 -0600)
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>
block/blk-core.c

index e26341a..9a78f62 100644 (file)
@@ -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;
        }