On 9/23/19 4:02 PM, Martin Wilck wrote:
> From: Martin Wilck <mwilck@xxxxxxxx>
>
> Make sure that bsg_queue_rq() calls put_device() if an error is
> encountered after get_device() was successful.
>
> Fixes: cd2f076f1d7a ("bsg: convert to use blk-mq")
> Signed-off-by: Martin Wilck <mwilck@xxxxxxxx>
> ---
> block/bsg-lib.c | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/block/bsg-lib.c b/block/bsg-lib.c
> index 785dd58..347dda1 100644
> --- a/block/bsg-lib.c
> +++ b/block/bsg-lib.c
> @@ -266,6 +266,7 @@ static blk_status_t bsg_queue_rq(struct blk_mq_hw_ctx *hctx,
> struct request *req = bd->rq;
> struct bsg_set *bset =
> container_of(q->tag_set, struct bsg_set, tag_set);
> + int sts = BLK_STS_IOERR;
> int ret;
>
> blk_mq_start_request(req);
> @@ -274,14 +275,15 @@ static blk_status_t bsg_queue_rq(struct blk_mq_hw_ctx *hctx,
> return BLK_STS_IOERR;
>
> if (!bsg_prepare_job(dev, req))
> - return BLK_STS_IOERR;
> + goto out;
>
> ret = bset->job_fn(blk_mq_rq_to_pdu(req));
> - if (ret)
> - return BLK_STS_IOERR;
> + if (!ret)
> + sts = BLK_STS_OK;
>
> +out:
> put_device(dev);
> - return BLK_STS_OK;
> + return sts;
> }
>
> /* called right after the request is allocated for the request_queue */
>
Reviewed-by: Hannes Reinecke <hare@xxxxxxxx>
Cheers,
Hannes
--
Dr. Hannes Reinecke Teamlead Storage & Networking
hare@xxxxxxx +49 911 74053 688
SUSE Software Solutions Germany GmbH, Maxfeldstr. 5, 90409 Nürnberg
HRB 247165 (AG München), GF: Felix Imendörffer
