From mboxrd@z Thu Jan  1 00:00:00 1970
From: hch@lst.de (Christoph Hellwig)
Date: Tue, 19 Jun 2018 07:15:04 +0200
Subject: [PATCH 1/1] nvme-rdma: fix error flow during controller reset
In-Reply-To: <1529247426-13303-1-git-send-email-maxg@mellanox.com>
References: <1529247426-13303-1-git-send-email-maxg@mellanox.com>
Message-ID: <20180619051504.GA22076@lst.de>

>  		ret = nvme_rdma_configure_io_queues(ctrl, false);
>  		if (ret)
> -			goto out_fail;
> +			goto destroy_admin;
>  	}
>  
>  	changed = nvme_change_ctrl_state(&ctrl->ctrl, NVME_CTRL_LIVE);
> @@ -1795,6 +1795,8 @@ static void nvme_rdma_reset_ctrl_work(struct work_struct *work)
>  
>  	return;
>  
> +destroy_admin:
> +	nvme_rdma_destroy_admin_queue(ctrl, false);
>  out_fail:
>  	++ctrl->ctrl.nr_reconnects;
>  	nvme_rdma_reconnect_or_remove(ctrl);

What about:

nvme_rdma_reconnect_or_remove
 -> nvme_delete_ctrl
  -> nvme_rdma_delete_ctrl
   -> nvme_rdma_shutdown_ctrl
    -> nvme_rdma_destroy_admin_queue

?