diff options
| author | Martin Wilck <mwilck@suse.com> | 2019-09-23 14:02:02 +0000 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2019-09-23 11:17:24 -0600 |
| commit | d46fe2cb2dce7f5038473b5859e03f5e16b7428e (patch) | |
| tree | 408e14effb0c002d652c057826fd0f0f1c25805e | |
| parent | be21683e48f26032199504fb60b9a27eeff05fc3 (diff) | |
| download | linux-d46fe2cb2dce7f5038473b5859e03f5e16b7428e.tar.bz2 | |
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: cd2f076f1d7a ("bsg: convert to use blk-mq")
Signed-off-by: Martin Wilck <mwilck@suse.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
| -rw-r--r-- | block/bsg-lib.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/block/bsg-lib.c b/block/bsg-lib.c index 785dd58947f1..347dda16c2f4 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 */ |