Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8decf5d5 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

nvme: remove nvme_req_needs_failover 



Now that we just call out to blk_path_error there isn't really any good
reason to not merge it into the only caller.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarKeith Busch <keith.busch@intel.com>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Reviewed-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
parent 0e98719b

drivers/nvme/host/core.c

+2 −1
Original line number Diff line number Diff line
@@ -236,7 +236,8 @@ void nvme_complete_rq(struct request *req) 
	trace_nvme_complete_rq(req);



	if (unlikely(status != BLK_STS_OK && nvme_req_needs_retry(req))) {

		if (nvme_req_needs_failover(req, status)) {

		if ((req->cmd_flags & REQ_NVME_MPATH) &&

		    blk_path_error(status)) {

			nvme_failover_req(req);

			return;

		}

drivers/nvme/host/multipath.c

+0 −7
Original line number Diff line number Diff line
@@ -56,13 +56,6 @@ void nvme_failover_req(struct request *req) 
	kblockd_schedule_work(&ns->head->requeue_work);

}



bool nvme_req_needs_failover(struct request *req, blk_status_t error)

{

	if (!(req->cmd_flags & REQ_NVME_MPATH))

		return false;

	return blk_path_error(error);

}



void nvme_kick_requeue_lists(struct nvme_ctrl *ctrl)

{

	struct nvme_ns *ns;

drivers/nvme/host/nvme.h

+0 −6
Original line number Diff line number Diff line
@@ -453,7 +453,6 @@ extern const struct block_device_operations nvme_ns_head_ops; 
void nvme_set_disk_name(char *disk_name, struct nvme_ns *ns,

			struct nvme_ctrl *ctrl, int *flags);

void nvme_failover_req(struct request *req);

bool nvme_req_needs_failover(struct request *req, blk_status_t error);

void nvme_kick_requeue_lists(struct nvme_ctrl *ctrl);

int nvme_mpath_alloc_disk(struct nvme_ctrl *ctrl,struct nvme_ns_head *head);

void nvme_mpath_add_disk(struct nvme_ns_head *head);
@@ -490,11 +489,6 @@ static inline void nvme_set_disk_name(char *disk_name, struct nvme_ns *ns, 
static inline void nvme_failover_req(struct request *req)

{

}

static inline bool nvme_req_needs_failover(struct request *req,

					   blk_status_t error)

{

	return false;

}

static inline void nvme_kick_requeue_lists(struct nvme_ctrl *ctrl)

{

}