From 0f3dad7fa4568c84a64e258fc331970a65a39d7d Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Wed, 16 Sep 2020 21:35:06 -0400 Subject: [PATCH] Drop nvme-have-nvme_wait_freeze_timeout-return-if-it-time.patch from 4.19 Signed-off-by: Sasha Levin --- ...ait_freeze_timeout-return-if-it-time.patch | 59 ------------------- queue-4.19/series | 1 - 2 files changed, 60 deletions(-) delete mode 100644 queue-4.19/nvme-have-nvme_wait_freeze_timeout-return-if-it-time.patch diff --git a/queue-4.19/nvme-have-nvme_wait_freeze_timeout-return-if-it-time.patch b/queue-4.19/nvme-have-nvme_wait_freeze_timeout-return-if-it-time.patch deleted file mode 100644 index c6f115b5956..00000000000 --- a/queue-4.19/nvme-have-nvme_wait_freeze_timeout-return-if-it-time.patch +++ /dev/null @@ -1,59 +0,0 @@ -From bb38c77e08e5a9389aa5685594defdb78ee6cc48 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 30 Jul 2020 13:24:45 -0700 -Subject: nvme: have nvme_wait_freeze_timeout return if it timed out - -From: Sagi Grimberg - -[ Upstream commit 7cf0d7c0f3c3b0203aaf81c1bc884924d8fdb9bd ] - -Users can detect if the wait has completed or not and take appropriate -actions based on this information (e.g. weather to continue -initialization or rather fail and schedule another initialization -attempt). - -Reviewed-by: Christoph Hellwig -Signed-off-by: Sagi Grimberg -Signed-off-by: Sasha Levin ---- - drivers/nvme/host/core.c | 3 ++- - drivers/nvme/host/nvme.h | 2 +- - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c -index 0d60f2f8f3eec..1b0133564f0ca 100644 ---- a/drivers/nvme/host/core.c -+++ b/drivers/nvme/host/core.c -@@ -3726,7 +3726,7 @@ void nvme_unfreeze(struct nvme_ctrl *ctrl) - } - EXPORT_SYMBOL_GPL(nvme_unfreeze); - --void nvme_wait_freeze_timeout(struct nvme_ctrl *ctrl, long timeout) -+int nvme_wait_freeze_timeout(struct nvme_ctrl *ctrl, long timeout) - { - struct nvme_ns *ns; - -@@ -3737,6 +3737,7 @@ void nvme_wait_freeze_timeout(struct nvme_ctrl *ctrl, long timeout) - break; - } - up_read(&ctrl->namespaces_rwsem); -+ return timeout; - } - EXPORT_SYMBOL_GPL(nvme_wait_freeze_timeout); - -diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h -index cc4273f119894..9bada68b4bd0c 100644 ---- a/drivers/nvme/host/nvme.h -+++ b/drivers/nvme/host/nvme.h -@@ -438,7 +438,7 @@ void nvme_start_queues(struct nvme_ctrl *ctrl); - void nvme_kill_queues(struct nvme_ctrl *ctrl); - void nvme_unfreeze(struct nvme_ctrl *ctrl); - void nvme_wait_freeze(struct nvme_ctrl *ctrl); --void nvme_wait_freeze_timeout(struct nvme_ctrl *ctrl, long timeout); -+int nvme_wait_freeze_timeout(struct nvme_ctrl *ctrl, long timeout); - void nvme_start_freeze(struct nvme_ctrl *ctrl); - - #define NVME_QID_ANY -1 --- -2.25.1 - diff --git a/queue-4.19/series b/queue-4.19/series index 79a91e12ac2..681347c8c46 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -25,7 +25,6 @@ drivers-net-wan-lapbether-set-network_header-before-.patch xfs-initialize-the-shortform-attr-header-padding-ent.patch irqchip-eznps-fix-build-error-for-arc700-builds.patch nvme-fabrics-don-t-check-state-nvme_ctrl_new-for-req.patch -nvme-have-nvme_wait_freeze_timeout-return-if-it-time.patch nvme-rdma-serialize-controller-teardown-sequences.patch hid-quirks-set-increment_usage_on_duplicate-for-all-.patch drivers-net-wan-hdlc_cisco-add-hard_header_len.patch -- 2.47.3