Home Home > GIT Browse > SLE12-SP3
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHannes Reinecke <hare@suse.de>2019-05-22 10:38:46 +0200
committerHannes Reinecke <hare@suse.de>2019-05-22 10:38:46 +0200
commit56860f5fcdb29142724ae4e3242a2f1d4496012c (patch)
tree323fe382f3268c6635b3a89d7c64b2d132ff3689
parent71a9773b4506bf012a1836eaec680820b1395e26 (diff)
nvme: Don't allow to reset a reconnecting controllerSLE12-SP3
(bsc#1133874).
-rw-r--r--patches.drivers/nvme-Don-t-allow-to-reset-a-reconnecting-controller.patch35
-rw-r--r--series.conf1
2 files changed, 36 insertions, 0 deletions
diff --git a/patches.drivers/nvme-Don-t-allow-to-reset-a-reconnecting-controller.patch b/patches.drivers/nvme-Don-t-allow-to-reset-a-reconnecting-controller.patch
new file mode 100644
index 0000000000..7d4e623055
--- /dev/null
+++ b/patches.drivers/nvme-Don-t-allow-to-reset-a-reconnecting-controller.patch
@@ -0,0 +1,35 @@
+From: Sagi Grimberg <sagi@grimberg.me>
+Date: Thu, 4 May 2017 13:33:12 +0300
+Subject: nvme: Don't allow to reset a reconnecting controller
+Patch-mainline: v4.13-rc1
+Git-commit: c58bd1bf4d46a020b7a1aa0710bca8191d789caa
+References: bsc#1133874
+
+The reset operation is guaranteed to fail for all scenarios
+but the esoteric case where in the last reconnect attempt
+concurrent with the reset we happen to successfully reconnect.
+
+We just deny initiating a reset if we are reconnecting.
+
+Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
+Signed-off-by: Christoph Hellwig <hch@lst.de>
+Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
+---
+ drivers/nvme/host/core.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
+index 75a865d6719c..80902de33684 100644
+--- a/drivers/nvme/host/core.c
++++ b/drivers/nvme/host/core.c
+@@ -157,7 +157,6 @@ bool nvme_change_ctrl_state(struct nvme_ctrl *ctrl,
+ switch (old_state) {
+ case NVME_CTRL_NEW:
+ case NVME_CTRL_LIVE:
+- case NVME_CTRL_RECONNECTING:
+ changed = true;
+ /* FALLTHRU */
+ default:
+--
+2.12.3
+
diff --git a/series.conf b/series.conf
index d7c8524232..91f6c878bf 100644
--- a/series.conf
+++ b/series.conf
@@ -21956,6 +21956,7 @@
patches.fixes/iommu-amd-fix-interrupt-remapping-when-disable-guest_mode
patches.suse/loop-Remove-unused-bdev-argument-from-loop_set_capac.patch
patches.drivers/nvme-rdma-make-nvme_rdma_-create-destroy-_queue_ib-s.patch
+ patches.drivers/nvme-Don-t-allow-to-reset-a-reconnecting-controller.patch
patches.drivers/nvme-pci-Remove-watchdog-timer.patch
patches.drivers/0451-scatterlist-add-sg_zero_buffer-helper.patch
patches.drivers/0452-nvmet-use-NVME_IDENTIFY_DATA_SIZE.patch