Commit 903f8aee authored by Ming Lei's avatar Ming Lei Committed by Jens Axboe

block: ublk_drv: add common exit handling

Simplify exit handling a bit, and prepare for supporting fused command.
Reviewed-by: default avatarZiyang Zhang <ZiyangZhang@linux.alibaba.com>
Signed-off-by: default avatarMing Lei <ming.lei@redhat.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 0d11f3cf
...@@ -655,14 +655,15 @@ static void ublk_complete_rq(struct request *req) ...@@ -655,14 +655,15 @@ static void ublk_complete_rq(struct request *req)
struct ublk_queue *ubq = req->mq_hctx->driver_data; struct ublk_queue *ubq = req->mq_hctx->driver_data;
struct ublk_io *io = &ubq->ios[req->tag]; struct ublk_io *io = &ubq->ios[req->tag];
unsigned int unmapped_bytes; unsigned int unmapped_bytes;
blk_status_t res = BLK_STS_OK;
/* failed read IO if nothing is read */ /* failed read IO if nothing is read */
if (!io->res && req_op(req) == REQ_OP_READ) if (!io->res && req_op(req) == REQ_OP_READ)
io->res = -EIO; io->res = -EIO;
if (io->res < 0) { if (io->res < 0) {
blk_mq_end_request(req, errno_to_blk_status(io->res)); res = errno_to_blk_status(io->res);
return; goto exit;
} }
/* /*
...@@ -671,10 +672,8 @@ static void ublk_complete_rq(struct request *req) ...@@ -671,10 +672,8 @@ static void ublk_complete_rq(struct request *req)
* *
* Both the two needn't unmap. * Both the two needn't unmap.
*/ */
if (req_op(req) != REQ_OP_READ && req_op(req) != REQ_OP_WRITE) { if (req_op(req) != REQ_OP_READ && req_op(req) != REQ_OP_WRITE)
blk_mq_end_request(req, BLK_STS_OK); goto exit;
return;
}
/* for READ request, writing data in iod->addr to rq buffers */ /* for READ request, writing data in iod->addr to rq buffers */
unmapped_bytes = ublk_unmap_io(ubq, req, io); unmapped_bytes = ublk_unmap_io(ubq, req, io);
...@@ -691,6 +690,10 @@ static void ublk_complete_rq(struct request *req) ...@@ -691,6 +690,10 @@ static void ublk_complete_rq(struct request *req)
blk_mq_requeue_request(req, true); blk_mq_requeue_request(req, true);
else else
__blk_mq_end_request(req, BLK_STS_OK); __blk_mq_end_request(req, BLK_STS_OK);
return;
exit:
blk_mq_end_request(req, res);
} }
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment