lkml.org 
[lkml]   [2023]   [Mar]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH V6 07/17] block: ublk_drv: add common exit handling
    Date
    Simplify exit handling a bit, and prepare for supporting fused command.

    Reviewed-by: Ziyang Zhang <ZiyangZhang@linux.alibaba.com>
    Signed-off-by: Ming Lei <ming.lei@redhat.com>
    ---
    drivers/block/ublk_drv.c | 15 +++++++++------
    1 file changed, 9 insertions(+), 6 deletions(-)

    diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk_drv.c
    index c73cc57ec547..bc46616710d4 100644
    --- a/drivers/block/ublk_drv.c
    +++ b/drivers/block/ublk_drv.c
    @@ -655,14 +655,15 @@ static void ublk_complete_rq(struct request *req)
    struct ublk_queue *ubq = req->mq_hctx->driver_data;
    struct ublk_io *io = &ubq->ios[req->tag];
    unsigned int unmapped_bytes;
    + blk_status_t res = BLK_STS_OK;

    /* failed read IO if nothing is read */
    if (!io->res && req_op(req) == REQ_OP_READ)
    io->res = -EIO;

    if (io->res < 0) {
    - blk_mq_end_request(req, errno_to_blk_status(io->res));
    - return;
    + res = errno_to_blk_status(io->res);
    + goto exit;
    }

    /*
    @@ -671,10 +672,8 @@ static void ublk_complete_rq(struct request *req)
    *
    * Both the two needn't unmap.
    */
    - if (req_op(req) != REQ_OP_READ && req_op(req) != REQ_OP_WRITE) {
    - blk_mq_end_request(req, BLK_STS_OK);
    - return;
    - }
    + if (req_op(req) != REQ_OP_READ && req_op(req) != REQ_OP_WRITE)
    + goto exit;

    /* for READ request, writing data in iod->addr to rq buffers */
    unmapped_bytes = ublk_unmap_io(ubq, req, io);
    @@ -691,6 +690,10 @@ static void ublk_complete_rq(struct request *req)
    blk_mq_requeue_request(req, true);
    else
    __blk_mq_end_request(req, BLK_STS_OK);
    +
    + return;
    +exit:
    + blk_mq_end_request(req, res);
    }

    /*
    --
    2.39.2
    \
     
     \ /
      Last update: 2023-03-30 13:40    [W:4.399 / U:0.496 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site