Commit 4bca70d0 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe

nvme-fc: drop ctrl for all command completions

A requeue means we go through nvme_fc_start_fcp_op again and get
another controller reference.  To make sure the refcount doesn't
leak we also need to drop it for every completion that came from
the LLDD.
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent f2cd54d3
...@@ -1937,7 +1937,7 @@ nvme_fc_complete_rq(struct request *rq) ...@@ -1937,7 +1937,7 @@ nvme_fc_complete_rq(struct request *rq)
if (nvme_req_needs_retry(rq, rq->errors)) { if (nvme_req_needs_retry(rq, rq->errors)) {
rq->retries++; rq->retries++;
nvme_requeue_req(rq); nvme_requeue_req(rq);
return; goto put_ctrl;
} }
if (blk_rq_is_passthrough(rq)) if (blk_rq_is_passthrough(rq))
...@@ -1946,9 +1946,10 @@ nvme_fc_complete_rq(struct request *rq) ...@@ -1946,9 +1946,10 @@ nvme_fc_complete_rq(struct request *rq)
error = nvme_error_status(rq->errors); error = nvme_error_status(rq->errors);
} }
blk_mq_end_request(rq, error);
put_ctrl:
nvme_fc_ctrl_put(ctrl); nvme_fc_ctrl_put(ctrl);
blk_mq_end_request(rq, error);
} }
static const struct blk_mq_ops nvme_fc_mq_ops = { static const struct blk_mq_ops nvme_fc_mq_ops = {
......
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