diff options
| author |   Max Gurtovoy <maxg@mellanox.com> | 2019-10-13 19:57:36 +0300 |
|---|---|---|
| committer |   Jens Axboe <axboe@kernel.dk> | 2019-11-04 10:56:41 -0700 |
| commit | 16686f3a6c3cd6316dbc5cba886242c73f713237 (patch) | |
| tree | f3e82a026c6f820216269488a0ea461002172a13 /drivers/nvme/host/core.c | |
| parent | nvme: introduce "Command Aborted By host" status code (diff) | |
| download | linux-dev-16686f3a6c3cd6316dbc5cba886242c73f713237.tar.xz linux-dev-16686f3a6c3cd6316dbc5cba886242c73f713237.zip | |
nvme: move common call to nvme_cleanup_cmd to core layer
nvme_cleanup_cmd should be called for each call to nvme_setup_cmd
(symmetrical functions). Move the call for nvme_cleanup_cmd to the common
core layer and call it during nvme_complete_rq for the good flow. For
error flow, each transport will call nvme_cleanup_cmd independently. Also
take care of a special case of path failure, where we call
nvme_complete_rq without doing nvme_setup_cmd.
Signed-off-by: Max Gurtovoy <maxg@mellanox.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Keith Busch <kbusch@kernel.org>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to '')
| -rw-r--r-- | drivers/nvme/host/core.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index dfa122beb4cf..9c743610e6ea 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -268,6 +268,8 @@ void nvme_complete_rq(struct request *req) trace_nvme_complete_rq(req); + nvme_cleanup_cmd(req); + if (nvme_req(req)->ctrl->kas) nvme_req(req)->ctrl->comp_seen = true; |