diff options
| author | Christoph Hellwig <hch@lst.de> | 2020-09-28 13:14:20 +0300 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2020-10-07 08:56:17 +0300 |
| commit | 81382f1730d24a60e2b0499592e64e6e640b1871 (patch) | |
| tree | ff8fd31526e9b848d7f4bad89424a0322b9cc96f /drivers/nvme | |
| parent | 2124f096fb4521d8efdf2412e9102d475ff5cd36 (diff) | |
| download | linux-81382f1730d24a60e2b0499592e64e6e640b1871.tar.xz | |
nvme: rename __nvme_revalidate_disk
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>
Diffstat (limited to 'drivers/nvme')
| -rw-r--r-- | drivers/nvme/host/core.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index c04043a94e64..fede487f6e04 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -2076,10 +2076,9 @@ static void nvme_set_chunk_sectors(struct nvme_ns *ns, struct nvme_id_ns *id) 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 gendisk *disk, struct nvme_id_ns *id) } 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); @@ -2186,7 +2185,7 @@ static int nvme_validate_ns(struct nvme_ns *ns) goto free_id; } - ret = __nvme_revalidate_disk(ns->disk, id); + ret = nvme_update_ns_info(ns, id); free_id: kfree(id); out: @@ -3933,7 +3932,7 @@ static void nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid) 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; |