nvme: remove the disk argument to nvme_update_zone_info

The queue can trivially be derived from the nvme_ns structure.

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>

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 400d995f95fe2d0de9cc28d8b5bf3e95b8a2df9f..d4b5032084972a925a50326d7801723e9fc3319c 100644 (file)
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -2095,7 +2095,7 @@ static int __nvme_revalidate_disk(struct gendisk *disk, struct nvme_id_ns *id)
        case NVME_CSI_NVM:
                break;
        case NVME_CSI_ZNS:
-               ret = nvme_update_zone_info(disk, ns, lbaf);
+               ret = nvme_update_zone_info(ns, lbaf);
                if (ret) {
                        dev_warn(ctrl->device,
                                "failed to add zoned namespace:%u ret:%d\n",

diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
index 6cbbd1597ae6d701a4f84a94f5dcaf471875a0b2..5667761001267d46148571373a8713dc002d97eb 100644 (file)
--- a/drivers/nvme/host/nvme.h
+++ b/drivers/nvme/host/nvme.h
@@ -760,9 +760,7 @@ static inline void nvme_mpath_start_freeze(struct nvme_subsystem *subsys)
 
 int nvme_revalidate_zones(struct nvme_ns *ns);
 #ifdef CONFIG_BLK_DEV_ZONED
-int nvme_update_zone_info(struct gendisk *disk, struct nvme_ns *ns,
-                         unsigned lbaf);
-
+int nvme_update_zone_info(struct nvme_ns *ns, unsigned lbaf);
 int nvme_report_zones(struct gendisk *disk, sector_t sector,
                      unsigned int nr_zones, report_zones_cb cb, void *data);
 
@@ -779,9 +777,7 @@ static inline blk_status_t nvme_setup_zone_mgmt_send(struct nvme_ns *ns,
        return BLK_STS_NOTSUPP;
 }
 
-static inline int nvme_update_zone_info(struct gendisk *disk,
-                                       struct nvme_ns *ns,
-                                       unsigned lbaf)
+static inline int nvme_update_zone_info(struct nvme_ns *ns, unsigned lbaf)
 {
        dev_warn(ns->ctrl->device,
                 "Please enable CONFIG_BLK_DEV_ZONED to support ZNS devices\n");

diff --git a/drivers/nvme/host/zns.c b/drivers/nvme/host/zns.c
index 56d708017d062d61627bddda8cc58e3bfaa0ae4c..67e87e9f306f167b4053bf00a05da712610e58c6 100644 (file)
--- a/drivers/nvme/host/zns.c
+++ b/drivers/nvme/host/zns.c
@@ -46,11 +46,10 @@ static int nvme_set_max_append(struct nvme_ctrl *ctrl)
        return 0;
 }
 
-int nvme_update_zone_info(struct gendisk *disk, struct nvme_ns *ns,
-                         unsigned lbaf)
+int nvme_update_zone_info(struct nvme_ns *ns, unsigned lbaf)
 {
        struct nvme_effects_log *log = ns->head->effects;
-       struct request_queue *q = disk->queue;
+       struct request_queue *q = ns->queue;
        struct nvme_command c = { };
        struct nvme_id_ns_zns *id;
        int status;