Commit 50e8d8ee authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

nvme: mark nvme_queue_scan static 



And move it toward the top of the file to avoid a forward declaration.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
parent c0561f82

drivers/nvme/host/core.c

+9 −10
Original line number Diff line number Diff line
@@ -100,6 +100,15 @@ static struct class *nvme_subsys_class; 
static void nvme_ns_remove(struct nvme_ns *ns);

static int nvme_revalidate_disk(struct gendisk *disk);



static void nvme_queue_scan(struct nvme_ctrl *ctrl)

{

	/*

	 * Only new queue scan work when admin and IO queues are both alive

	 */

	if (ctrl->state == NVME_CTRL_LIVE)

		queue_work(nvme_wq, &ctrl->scan_work);

}



int nvme_reset_ctrl(struct nvme_ctrl *ctrl)

{

	if (!nvme_change_ctrl_state(ctrl, NVME_CTRL_RESETTING))
@@ -3214,16 +3223,6 @@ static void nvme_scan_work(struct work_struct *work) 
	kfree(id);

}



void nvme_queue_scan(struct nvme_ctrl *ctrl)

{

	/*

	 * Only new queue scan work when admin and IO queues are both alive

	 */

	if (ctrl->state == NVME_CTRL_LIVE)

		queue_work(nvme_wq, &ctrl->scan_work);

}

EXPORT_SYMBOL_GPL(nvme_queue_scan);



/*

 * This function iterates the namespace list unlocked to allow recovery from

 * controller failure. It is up to the caller to ensure the namespace list is

drivers/nvme/host/nvme.h

+0 −1
Original line number Diff line number Diff line
@@ -395,7 +395,6 @@ void nvme_stop_ctrl(struct nvme_ctrl *ctrl); 
void nvme_put_ctrl(struct nvme_ctrl *ctrl);

int nvme_init_identify(struct nvme_ctrl *ctrl);



void nvme_queue_scan(struct nvme_ctrl *ctrl);

void nvme_remove_namespaces(struct nvme_ctrl *ctrl);



int nvme_sec_submit(void *data, u16 spsp, u8 secp, void *buffer, size_t len,