two nvme-tcp small fixes
Sagi Grimberg
maintainercover two nvme-tcp small fixes
Left overs from when I had the nvme-tcp on top of centralized reset/error-recovery flows. In essence, these shouldn't exist in a transport driver.
Sagi Grimberg (2):
nvme-tcp: remove dead code
nvme-tcp: don't ask if controller is fabrics
drivers/nvme/host/tcp.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-)
Signature · 1 line
2.17.1
Sagi Grimberg
maintainerPATCH 1/2 nvme-tcp: remove dead code
we should never touch the opal device from the transport driver.
Signed-off-by Sagi Grimberg <sagi at grimberg.me>
--- drivers/nvme/host/tcp.c | 1 - 1 file changed, 1 deletion(-)
drivers/nvme/host/tcp.c +0 -1
@@ -1620,7 +1620,6 @@ static void nvme_tcp_destroy_admin_queue(struct nvme_ctrl *ctrl, bool remove) {nvme_tcp_stop_queue (ctrl,0 );if (remove) { -free_opal_dev (ctrl->opal_dev);blk_cleanup_queue (ctrl->admin_q);blk_mq_free_tag_set (ctrl->admin_tagset); }
Signature · 1 line
2.17.1
Sagi Grimberg
maintainerPATCH 2/2 nvme-tcp: don't ask if controller is fabrics
In reply to Sagi GrimbergFor sure we are a fabric driver.
Signed-off-by Sagi Grimberg <sagi at grimberg.me>
--- drivers/nvme/host/tcp.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-)
drivers/nvme/host/tcp.c +6 -9
@@ -1565,8 +1565,7 @@ 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_cleanup_queue (ctrl->connect_q);blk_mq_free_tag_set (ctrl->tagset); }nvme_tcp_free_io_queues (ctrl);
@@ -1587,12 +1586,10 @@ 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; - } + 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,
@@ -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)
Signature · 1 line
2.17.1
cover two nvme-tcp small fixes
In reply to Sagi GrimbergThanks,
applied to nvme-4.21.