Commit d525c3c0 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

nvme: remove the disk argument to nvme_update_zone_info 



The queue can trivially be derived from the nvme_ns structure.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarKeith Busch <kbusch@kernel.org>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Reviewed-by: default avatarChaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Reviewed-by: default avatarDamien Le Moal <damien.lemoal@wdc.com>
parent 7fad20dd

drivers/nvme/host/core.c

+1 −1
Original line number Diff line number Diff line
@@ -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",

drivers/nvme/host/nvme.h

+2 −6
Original line number Diff line number Diff line
@@ -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");

drivers/nvme/host/zns.c

+2 −3
Original line number Diff line number Diff line
@@ -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;