Skip to content

Commit

Permalink
nvme-fc: drop ctrl for all command completions
Browse files Browse the repository at this point in the history
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: Christoph Hellwig <hch@lst.de>
Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Jens Axboe <axboe@fb.com>
  • Loading branch information
Christoph Hellwig authored and Jens Axboe committed Apr 4, 2017
1 parent f2cd54d commit 4bca70d
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions drivers/nvme/host/fc.c
Original file line number Diff line number Diff line change
Expand Up @@ -1937,7 +1937,7 @@ nvme_fc_complete_rq(struct request *rq)
if (nvme_req_needs_retry(rq, rq->errors)) {
rq->retries++;
nvme_requeue_req(rq);
return;
goto put_ctrl;
}

if (blk_rq_is_passthrough(rq))
Expand All @@ -1946,9 +1946,10 @@ nvme_fc_complete_rq(struct request *rq)
error = nvme_error_status(rq->errors);
}

blk_mq_end_request(rq, error);
put_ctrl:
nvme_fc_ctrl_put(ctrl);

blk_mq_end_request(rq, error);
}

static const struct blk_mq_ops nvme_fc_mq_ops = {
Expand Down

0 comments on commit 4bca70d

Please sign in to comment.