Commit a2e4c5f5 authored by Keith Busch's avatar Keith Busch
Browse files

nvme-multipath: fix io accounting on failover 



There are io stats accounting that needs to be handled, so don't call
blk_mq_end_request() directly. Use the existing nvme_end_req() helper
that already handles everything.

Fixes: d4d957b5 ("nvme-multipath: support io stats on the mpath device")
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarKeith Busch <kbusch@kernel.org>
parent 2fe7b422

drivers/nvme/host/core.c

+1 −1
Original line number Diff line number Diff line
@@ -422,7 +422,7 @@ static inline void __nvme_end_req(struct request *req) 
		nvme_mpath_end_request(req);

}



static inline void nvme_end_req(struct request *req)

void nvme_end_req(struct request *req)

{

	blk_status_t status = nvme_error_status(nvme_req(req)->status);

drivers/nvme/host/multipath.c

+2 −1
Original line number Diff line number Diff line
@@ -118,7 +118,8 @@ void nvme_failover_req(struct request *req) 
	blk_steal_bios(&ns->head->requeue_list, req);

	spin_unlock_irqrestore(&ns->head->requeue_lock, flags);



	blk_mq_end_request(req, 0);

	nvme_req(req)->status = 0;

	nvme_end_req(req);

	kblockd_schedule_work(&ns->head->requeue_work);

}

drivers/nvme/host/nvme.h

+1 −0
Original line number Diff line number Diff line
@@ -767,6 +767,7 @@ static inline bool nvme_state_terminal(struct nvme_ctrl *ctrl) 
	}

}



void nvme_end_req(struct request *req);

void nvme_complete_rq(struct request *req);

void nvme_complete_batch_req(struct request *req);