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: Christoph Hellwig <hch@lst.de>
Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Jens Axboe <axboe@fb.com>

diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c
index bae10a95b1255b3cd1ab6cd62744ae8d85ca17a4..c7e6da2a6108796b67ac0e275d20a8e39b1708d5 100644 (file)
--- a/drivers/nvme/host/fc.c
+++ b/drivers/nvme/host/fc.c
@@ -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))
@@ -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 = {