From: Christoph Hellwig <hch@lst.de>
Date: Wed, 19 May 2021 07:08:41 +0000 (+0200)
Subject: nvme: open code nvme_put_ns_from_disk in nvme_ns_head_ctrl_ioctl
X-Git-Tag: microblaze-v5.15~128^2~11^2~6
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=3e7d1a55165bdce2aaf1139ee8889e68eb29c263;p=linux-2.6-microblaze.git

nvme: open code nvme_put_ns_from_disk in nvme_ns_head_ctrl_ioctl

nvme_ns_head_ctrl_ioctl is always used on multipath nodes, so just call
srcu_read_unlock directly.

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

diff --git a/drivers/nvme/host/ioctl.c b/drivers/nvme/host/ioctl.c
index 3f84bd3b9259..2c6969ffe85c 100644
--- a/drivers/nvme/host/ioctl.c
+++ b/drivers/nvme/host/ioctl.c
@@ -377,7 +377,7 @@ static int nvme_ns_head_ctrl_ioctl(struct nvme_ns *ns, unsigned int cmd,
 	int ret;
 
 	nvme_get_ctrl(ns->ctrl);
-	nvme_put_ns_from_disk(head, srcu_idx);
+	srcu_read_unlock(&head->srcu, srcu_idx);
 	ret = nvme_ctrl_ioctl(ns->ctrl, cmd, argp);
 
 	nvme_put_ctrl(ctrl);