From: Edmund Nadolski <edmund.nadolski@intel.com>
Date: Tue, 3 Sep 2019 20:08:47 +0000 (-0600)
Subject: nvme: include admin_q sync with nvme_sync_queues
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=03894b7a896dc6eb3870e197bd7414ab0c947cbf;p=openwrt%2Fstaging%2Fblogic.git

nvme: include admin_q sync with nvme_sync_queues

nvme_sync_queues currently syncs all namespace queues, but should
also sync the admin queue, if present.

Signed-off-by: Edmund Nadolski <edmund.nadolski@intel.com>
Reviewed-by: Keith Busch <kbusch@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
---

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 0545eb97d838..1777c8e6dffd 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -4010,6 +4010,9 @@ void nvme_sync_queues(struct nvme_ctrl *ctrl)
 	list_for_each_entry(ns, &ctrl->namespaces, list)
 		blk_sync_queue(ns->queue);
 	up_read(&ctrl->namespaces_rwsem);
+
+	if (ctrl->admin_q)
+		blk_sync_queue(ctrl->admin_q);
 }
 EXPORT_SYMBOL_GPL(nvme_sync_queues);