From: Benjamin Marzinski <bmarzins@xxxxxxxxxx>
Revert "nvme: decouple basic ANA log page re-read support from native multipathing"
Upstream Status: RHEL-only
This reverts commit 7c3b072fb73423383a71443bb3157067e7d72d09.
Since RHEL no longer supports non-native NVMe multipathing, we no longer
need to carry this RHEL-only patch improving dm-multipath on NVMe
devices.
Signed-off-by: Benjamin Marzinski <bmarzins@xxxxxxxxxx>
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index blahblah..blahblah 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -458,8 +458,6 @@ void nvme_end_req(struct request *req)
static inline void nvme_failup_req(struct request *req)
{
- nvme_update_ana(req);
-
nvme_req(req)->status = NVME_SC_HOST_PATH_ERROR;
nvme_end_req(req);
}
diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c
index blahblah..blahblah 100644
--- a/drivers/nvme/host/multipath.c
+++ b/drivers/nvme/host/multipath.c
@@ -83,10 +83,14 @@ void nvme_mpath_start_freeze(struct nvme_subsystem *subsys)
blk_freeze_queue_start(h->disk->queue);
}
-void nvme_update_ana(struct request *req)
+void nvme_failover_req(struct request *req)
{
struct nvme_ns *ns = req->q->queuedata;
u16 status = nvme_req(req)->status & NVME_SCT_SC_MASK;
+ unsigned long flags;
+ struct bio *bio;
+
+ nvme_mpath_clear_current_path(ns);
/*
* If we got back an ANA error, we know the controller is alive but not
@@ -97,16 +101,6 @@ void nvme_update_ana(struct request *req)
set_bit(NVME_NS_ANA_PENDING, &ns->flags);
queue_work(nvme_wq, &ns->ctrl->ana_work);
}
-}
-
-void nvme_failover_req(struct request *req)
-{
- struct nvme_ns *ns = req->q->queuedata;
- unsigned long flags;
- struct bio *bio;
-
- nvme_mpath_clear_current_path(ns);
- nvme_update_ana(req);
spin_lock_irqsave(&ns->head->requeue_lock, flags);
for (bio = req->bio; bio; bio = bio->bi_next) {
diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
index blahblah..blahblah 100644
--- a/drivers/nvme/host/nvme.h
+++ b/drivers/nvme/host/nvme.h
@@ -953,7 +953,6 @@ void nvme_mpath_wait_freeze(struct nvme_subsystem *subsys);
void nvme_mpath_start_freeze(struct nvme_subsystem *subsys);
void nvme_mpath_default_iopolicy(struct nvme_subsystem *subsys);
void nvme_failover_req(struct request *req);
-void nvme_update_ana(struct request *req);
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 *ns, __le32 anagrpid);
@@ -996,9 +995,6 @@ static inline bool nvme_ctrl_use_ana(struct nvme_ctrl *ctrl)
static inline void nvme_failover_req(struct request *req)
{
}
-static inline void nvme_update_ana(struct request *req)
-{
-}
static inline void nvme_kick_requeue_lists(struct nvme_ctrl *ctrl)
{
}
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3690
--
_______________________________________________
kernel mailing list -- kernel@xxxxxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to kernel-leave@xxxxxxxxxxxxxxxxxxxxxxx
Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: https://lists.fedoraproject.org/archives/list/kernel@xxxxxxxxxxxxxxxxxxxxxxx
Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
