Skip to contentSkip to conversation

nvme: wait request queue freeze long enough

PATCH New Hillf Danton 1 participant 1 message Sep 5, 2020 NVMe

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 nvme: wait request queue freeze long enough

Apply the input timeout to every queue in order to avoid false positive.

Fixes 302ad8cc0933 ("nvme: Complete all stuck requests")
Cc Keith Busch <[email protected]>
Cc Sagi Grimberg <[email protected]>
Cc Christoph Hellwig <[email protected]>

---

drivers/nvme/host/core.c +4 -3
@@ -4570,15 +4570,16 @@ EXPORT_SYMBOL_GPL(nvme_unfreeze);
 int nvme_wait_freeze_timeout(struct nvme_ctrl *ctrl, long timeout)
 {
 	struct nvme_ns *ns;
+	long ret;
 
 	down_read(&ctrl->namespaces_rwsem);
 	list_for_each_entry(ns, &ctrl->namespaces, list) {
-		timeout = blk_mq_freeze_queue_wait_timeout(ns->queue, timeout);
-		if (timeout <= 0)
+		ret = blk_mq_freeze_queue_wait_timeout(ns->queue, timeout);
+		if (!ret)
 			break;
 	}
 	up_read(&ctrl->namespaces_rwsem);
-	return timeout;
+	return ret;
 }
 EXPORT_SYMBOL_GPL(nvme_wait_freeze_timeout);
 

--

_______________________________________________
Linux-nvme mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-nvme