From: Christoph Hellwig <hch@lst.de>
Date: Mon, 28 Sep 2020 12:14:20 +0200
Subject: nvme: rename __nvme_revalidate_disk
Patch-mainline: v5.10-rc1
Git-commit: 81382f1730d24a60e2b0499592e64e6e640b1871
References: bsc#1180197
Rename __nvme_revalidate_disk to nvme_update_ns_info and pass a
namespace instead of the gendisk.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Keith Busch <kbusch@kernel.org>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Reviewed-by: Damien Le Moal <damien.lemoal@wdc.com>
Acked-by: Daniel Wagner <dwagner@suse.de>
---
drivers/nvme/host/core.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -2076,10 +2076,9 @@ static void nvme_set_chunk_sectors(struc
blk_queue_chunk_sectors(ns->queue, iob);
}
-static int __nvme_revalidate_disk(struct gendisk *disk, struct nvme_id_ns *id)
+static int nvme_update_ns_info(struct nvme_ns *ns, struct nvme_id_ns *id)
{
unsigned lbaf = id->flbas & NVME_NS_FLBAS_LBA_MASK;
- struct nvme_ns *ns = disk->private_data;
struct nvme_ctrl *ctrl = ns->ctrl;
int ret;
@@ -2141,7 +2140,7 @@ static int __nvme_revalidate_disk(struct
}
nvme_set_chunk_sectors(ns, id);
- nvme_update_disk_info(disk, ns, id);
+ nvme_update_disk_info(ns->disk, ns, id);
#ifdef CONFIG_NVME_MULTIPATH
if (ns->head->disk) {
nvme_update_disk_info(ns->head->disk, ns, id);
@@ -2184,7 +2183,7 @@ static int nvme_validate_ns(struct nvme_
goto free_id;
}
- ret = __nvme_revalidate_disk(ns->disk, id);
+ ret = nvme_update_ns_info(ns, id);
free_id:
kfree(id);
out:
@@ -3956,7 +3955,7 @@ static void nvme_alloc_ns(struct nvme_ct
memcpy(disk->disk_name, disk_name, DISK_NAME_LEN);
ns->disk = disk;
- if (__nvme_revalidate_disk(disk, id))
+ if (nvme_update_ns_info(ns, id))
goto out_put_disk;
if (blk_queue_is_zoned(ns->queue) && nvme_revalidate_zones(ns))
goto out_put_disk;