openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Christoph Hellwig 2017-03-30 13:41:31 +02:00 committed by Jens Axboe
parent f2cd54d3eb
commit 4bca70d067
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/nvme/host/fc.c
View File

@ -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 = {