Commit e85037a2 authored by Sagi Grimberg's avatar Sagi Grimberg Committed by Christoph Hellwig
Browse files

nvme-tcp: don't ask if controller is fabrics 



For sure we are a fabric driver.

Signed-off-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent e9c2edc0

drivers/nvme/host/tcp.c

+6 −9
Original line number Diff line number Diff line
@@ -1565,7 +1565,6 @@ static void nvme_tcp_destroy_io_queues(struct nvme_ctrl *ctrl, bool remove) 
{

	nvme_tcp_stop_io_queues(ctrl);

	if (remove) {

		if (ctrl->ops->flags & NVME_F_FABRICS)

		blk_cleanup_queue(ctrl->connect_q);

		blk_mq_free_tag_set(ctrl->tagset);

	}
@@ -1587,13 +1586,11 @@ static int nvme_tcp_configure_io_queues(struct nvme_ctrl *ctrl, bool new) 
			goto out_free_io_queues;

		}



		if (ctrl->ops->flags & NVME_F_FABRICS) {

		ctrl->connect_q = blk_mq_init_queue(ctrl->tagset);

		if (IS_ERR(ctrl->connect_q)) {

			ret = PTR_ERR(ctrl->connect_q);

			goto out_free_tag_set;

		}

		}

	} else {

		blk_mq_update_nr_hw_queues(ctrl->tagset,

			ctrl->queue_count - 1);
@@ -1606,7 +1603,7 @@ static int nvme_tcp_configure_io_queues(struct nvme_ctrl *ctrl, bool new) 
	return 0;



out_cleanup_connect_q:

	if (new && (ctrl->ops->flags & NVME_F_FABRICS))

	if (new)

		blk_cleanup_queue(ctrl->connect_q);

out_free_tag_set:

	if (new)