nvme-fc: ensure association_id is cleared regardless of a Disconnect LS
Subsystems (2)
PATCH 1/1 nvme-fc: ensure association_id is cleared regardless of a Disconnect LS
Code today only clears the association_id if a Disconnect LS is transmit.
Remove ambiguity and unconditionally clear the association_id if the association has been terminated.
Signed-off-by James Smart <[email protected]>
--- drivers/nvme/host/fc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/nvme/host/fc.c +3 -3
@@ -1464,9 +1464,6 @@ nvme_fc_xmt_disconnect_assoc(struct nvme_fc_ctrl *ctrl) nvme_fc_disconnect_assoc_done);if (ret)kfree (lsop); - -/* only meaningful part to terminating the association */ - ctrl->association_id =0 ; }
@@ -2739,6 +2736,7 @@ nvme_fc_create_association(struct nvme_fc_ctrl *ctrl) out_disconnect_admin_queue:/* send a Disconnect(association) LS to fc-nvme target */ nvme_fc_xmt_disconnect_assoc (ctrl); + ctrl->association_id =0 ; out_delete_hw_queue:__nvme_fc_delete_hw_queue (ctrl, &ctrl->queues[0 ],0 ); out_free_queue:
@@ -2830,6 +2828,8 @@ nvme_fc_delete_association(struct nvme_fc_ctrl *ctrl)if (ctrl->association_id)nvme_fc_xmt_disconnect_assoc (ctrl); + ctrl->association_id =0 ; +if (ctrl->ctrl.tagset) {nvme_fc_delete_hw_io_queues (ctrl);nvme_fc_free_io_queues (ctrl);
Signature · 7 lines
2.13.7 _______________________________________________ Linux-nvme mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-nvme