UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

block: drop device references in bsg_queue_rq() 

Make sure that bsg_queue_rq() calls put_device() if an error is
encountered after get_device() was successful.

Fixes: cd2f076f1d ("bsg: convert to use blk-mq")
Signed-off-by: Martin Wilck <mwilck@suse.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Martin Wilck 2019-09-23 14:02:02 +00:00 committed by Jens Axboe
parent be21683e48
commit d46fe2cb2d
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
block/bsg-lib.c
View File

@ -266,6 +266,7 @@ static blk_status_t bsg_queue_rq(struct blk_mq_hw_ctx *hctx,
struct request *req = bd->rq; struct request *req = bd->rq;
struct bsg_set *bset = struct bsg_set *bset =
container_of(q->tag_set, struct bsg_set, tag_set); container_of(q->tag_set, struct bsg_set, tag_set);
int sts = BLK_STS_IOERR;
int ret; int ret;
blk_mq_start_request(req); 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; return BLK_STS_IOERR;
if (!bsg_prepare_job(dev, req)) if (!bsg_prepare_job(dev, req))
return BLK_STS_IOERR; goto out;
ret = bset->job_fn(blk_mq_rq_to_pdu(req)); ret = bset->job_fn(blk_mq_rq_to_pdu(req));
if (ret) if (!ret)
return BLK_STS_IOERR; sts = BLK_STS_OK;
out:
put_device(dev); put_device(dev);
return BLK_STS_OK; return sts;
} }
/* called right after the request is allocated for the request_queue */ /* called right after the request is allocated for the request_queue */