[PATCH v1] nvme-tcp: forward context to teardown admin queue function

[PATCH v1] nvme-tcp: forward context to teardown admin queue function

[Daniel Wagner]

nvme_tcp_setup_ctrl is called from different contexts. If the function
is called as part of the initial controller creation, the argument 'new'
is set to true. This tells the function to free all resources when an
error occurs.

Thus nvme_tcp_teardown_admin_queue should also be called with 'new' and
not always with 'false'.

Fixes: fd1418de10b9 ("nvme-tcp: avoid open-coding nvme_tcp_teardown_admin_queue()")
Signed-off-by: Daniel Wagner <dwagner@suse.de>
---
 drivers/nvme/host/tcp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c
index 89c44413c593..c31434b4da73 100644
--- a/drivers/nvme/host/tcp.c
+++ b/drivers/nvme/host/tcp.c
@@ -2278,7 +2278,7 @@ static int nvme_tcp_setup_ctrl(struct nvme_ctrl *ctrl, bool new)
 	}
 destroy_admin:
 	nvme_stop_keep_alive(ctrl);
-	nvme_tcp_teardown_admin_queue(ctrl, false);
+	nvme_tcp_teardown_admin_queue(ctrl, new);
 	return ret;
 }
 
-- 
2.47.0

Re: [PATCH v1] nvme-tcp: forward context to teardown admin queue function

[Christoph Hellwig]

On Mon, Oct 14, 2024 at 06:53:29PM +0200, Daniel Wagner wrote:
> nvme_tcp_setup_ctrl is called from different contexts. If the function
> is called as part of the initial controller creation, the argument 'new'
> is set to true. This tells the function to free all resources when an
> error occurs.
> 
> Thus nvme_tcp_teardown_admin_queue should also be called with 'new' and
> not always with 'false'.

Looks good:

Reviewed-by: Christoph Hellwig <hch@lst.de>

Re: [PATCH v1] nvme-tcp: forward context to teardown admin queue function

[Sagi Grimberg]

Reviewed-by: Sagi Grimberg <sagi@grimberg.me>

Re: [PATCH v1] nvme-tcp: forward context to teardown admin queue function

[Hannes Reinecke]

On 10/14/24 18:53, Daniel Wagner wrote:
> nvme_tcp_setup_ctrl is called from different contexts. If the function
> is called as part of the initial controller creation, the argument 'new'
> is set to true. This tells the function to free all resources when an
> error occurs.
> 
> Thus nvme_tcp_teardown_admin_queue should also be called with 'new' and
> not always with 'false'.
> 
> Fixes: fd1418de10b9 ("nvme-tcp: avoid open-coding nvme_tcp_teardown_admin_queue()")
> Signed-off-by: Daniel Wagner <dwagner@suse.de>
> ---
>   drivers/nvme/host/tcp.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c
> index 89c44413c593..c31434b4da73 100644
> --- a/drivers/nvme/host/tcp.c
> +++ b/drivers/nvme/host/tcp.c
> @@ -2278,7 +2278,7 @@ static int nvme_tcp_setup_ctrl(struct nvme_ctrl *ctrl, bool new)
>   	}
>   destroy_admin:
>   	nvme_stop_keep_alive(ctrl);
> -	nvme_tcp_teardown_admin_queue(ctrl, false);
> +	nvme_tcp_teardown_admin_queue(ctrl, new);
>   	return ret;
>   }
>   
Reviewed-by: Hannes Reinecke <hare@suse.de>

Cheers,

Hannes
-- 
Dr. Hannes Reinecke                  Kernel Storage Architect
hare@suse.de                                +49 911 74053 688
SUSE Software Solutions GmbH, Frankenstr. 146, 90461 Nürnberg
HRB 36809 (AG Nürnberg), GF: I. Totev, A. McDonald, W. Knoblich