Commit f21c4769 authored by Chaitanya Kulkarni's avatar Chaitanya Kulkarni Committed by Christoph Hellwig
Browse files

nvme: rename nvme_init_identify() 



This is a prep patch so that we can move the identify data structure
related code initialization from nvme_init_identify() into a helper.

Rename the function nvmet_init_identify() to nvmet_init_ctrl_finish().

Next patch will move the nvme_id_ctrl related initialization from newly
renamed function nvme_init_ctrl_finish() into the nvme_init_identify()
helper.

Signed-off-by: default avatarChaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 18479ddb

drivers/nvme/host/core.c

+4 −4
Original line number Diff line number Diff line
@@ -1120,7 +1120,7 @@ static void nvme_passthru_end(struct nvme_ctrl *ctrl, u32 effects) 
		mutex_unlock(&ctrl->scan_lock);

	}

	if (effects & NVME_CMD_EFFECTS_CCC)

		nvme_init_identify(ctrl);

		nvme_init_ctrl_finish(ctrl);

	if (effects & (NVME_CMD_EFFECTS_NIC | NVME_CMD_EFFECTS_NCC)) {

		nvme_queue_scan(ctrl);

		flush_work(&ctrl->scan_work);
@@ -1980,7 +1980,7 @@ static void nvme_config_write_zeroes(struct gendisk *disk, struct nvme_ns *ns) 
	 * In order to be more cautious use controller's max_hw_sectors value

	 * to configure the maximum sectors for the write-zeroes which is

	 * configured based on the controller's MDTS field in the

	 * nvme_init_identify() if available.

	 * nvme_init_ctrl_finish() if available.

	 */

	if (ns->ctrl->max_hw_sectors == UINT_MAX)

		max_blocks = (u64)USHRT_MAX + 1;
@@ -3066,7 +3066,7 @@ static int nvme_get_effects_log(struct nvme_ctrl *ctrl, u8 csi, 
 * register in our nvme_ctrl structure.  This should be called as soon as

 * the admin queue is fully up and running.

 */

int nvme_init_identify(struct nvme_ctrl *ctrl)

int nvme_init_ctrl_finish(struct nvme_ctrl *ctrl)

{

	struct nvme_id_ctrl *id;

	int ret, page_shift;
@@ -3253,7 +3253,7 @@ int nvme_init_identify(struct nvme_ctrl *ctrl) 
	kfree(id);

	return ret;

}

EXPORT_SYMBOL_GPL(nvme_init_identify);

EXPORT_SYMBOL_GPL(nvme_init_ctrl_finish);



static int nvme_dev_open(struct inode *inode, struct file *file)

{

drivers/nvme/host/fc.c

+1 −1
Original line number Diff line number Diff line
@@ -3086,7 +3086,7 @@ nvme_fc_create_association(struct nvme_fc_ctrl *ctrl) 


	blk_mq_unquiesce_queue(ctrl->ctrl.admin_q);



	ret = nvme_init_identify(&ctrl->ctrl);

	ret = nvme_init_ctrl_finish(&ctrl->ctrl);

	if (ret || test_bit(ASSOC_FAILED, &ctrl->flags))

		goto out_disconnect_admin_queue;

drivers/nvme/host/nvme.h

+1 −1
Original line number Diff line number Diff line
@@ -599,7 +599,7 @@ int nvme_init_ctrl(struct nvme_ctrl *ctrl, struct device *dev, 
void nvme_uninit_ctrl(struct nvme_ctrl *ctrl);

void nvme_start_ctrl(struct nvme_ctrl *ctrl);

void nvme_stop_ctrl(struct nvme_ctrl *ctrl);

int nvme_init_identify(struct nvme_ctrl *ctrl);

int nvme_init_ctrl_finish(struct nvme_ctrl *ctrl);



void nvme_remove_namespaces(struct nvme_ctrl *ctrl);

drivers/nvme/host/pci.c

+1 −1
Original line number Diff line number Diff line
@@ -2645,7 +2645,7 @@ static void nvme_reset_work(struct work_struct *work) 
	 */

	dev->ctrl.max_integrity_segments = 1;



	result = nvme_init_identify(&dev->ctrl);

	result = nvme_init_ctrl_finish(&dev->ctrl);

	if (result)

		goto out;

drivers/nvme/host/rdma.c

+1 −1
Original line number Diff line number Diff line
@@ -917,7 +917,7 @@ static int nvme_rdma_configure_admin_queue(struct nvme_rdma_ctrl *ctrl, 


	blk_mq_unquiesce_queue(ctrl->ctrl.admin_q);



	error = nvme_init_identify(&ctrl->ctrl);

	error = nvme_init_ctrl_finish(&ctrl->ctrl);

	if (error)

		goto out_quiesce_queue;