nvme: fix multipath batched completion accounting

Batched completions were missing the io stats accounting and bio trace
events. Move the common code to a helper and call it from the batched
and non-batched functions.

Fixes: d4d957b53d91ee ("nvme-multipath: support io stats on the mpath device")
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Keith Busch <kbusch@kernel.org>

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 954f850f113a1277ea2566fe98ae474fd4075f87..79cdd34dfa18e663ae6a9e7fbc5d47c080cff9bd 100644 (file)
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -414,6 +414,14 @@ static inline void nvme_end_req_zoned(struct request *req)
        }
 }
 
+static inline void __nvme_end_req(struct request *req)
+{
+       nvme_end_req_zoned(req);
+       nvme_trace_bio_complete(req);
+       if (req->cmd_flags & REQ_NVME_MPATH)
+               nvme_mpath_end_request(req);
+}
+
 static inline void nvme_end_req(struct request *req)
 {
        blk_status_t status = nvme_error_status(nvme_req(req)->status);
@@ -424,10 +432,7 @@ static inline void nvme_end_req(struct request *req)
                else
                        nvme_log_error(req);
        }
-       nvme_end_req_zoned(req);
-       nvme_trace_bio_complete(req);
-       if (req->cmd_flags & REQ_NVME_MPATH)
-               nvme_mpath_end_request(req);
+       __nvme_end_req(req);
        blk_mq_end_request(req, status);
 }
 
@@ -476,7 +481,7 @@ void nvme_complete_batch_req(struct request *req)
 {
        trace_nvme_complete_rq(req);
        nvme_cleanup_cmd(req);
-       nvme_end_req_zoned(req);
+       __nvme_end_req(req);
 }
 EXPORT_SYMBOL_GPL(nvme_complete_batch_req);