All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] net/smc: Fix error path in smc_init
@ 2019-05-14  6:39 ` YueHaibing
  0 siblings, 0 replies; 3+ messages in thread
From: YueHaibing @ 2019-05-14  6:39 UTC (permalink / raw)
  To: davem, ubraun, kgraul, hwippel
  Cc: linux-kernel, netdev, linux-s390, YueHaibing

If register_pernet_subsys success in smc_init,
we should cleanup it in case any other error.

Fixes: 64e28b52c7a6 (net/smc: add pnet table namespace support")
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
---
 net/smc/af_smc.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c
index 6f869ef..7d3207f 100644
--- a/net/smc/af_smc.c
+++ b/net/smc/af_smc.c
@@ -2019,7 +2019,7 @@ static int __init smc_init(void)
 
 	rc = smc_pnet_init();
 	if (rc)
-		return rc;
+		goto out_pernet_subsys;
 
 	rc = smc_llc_init();
 	if (rc) {
@@ -2070,6 +2070,9 @@ static int __init smc_init(void)
 	proto_unregister(&smc_proto);
 out_pnet:
 	smc_pnet_exit();
+out_pernet_subsys:
+	unregister_pernet_subsys(&smc_net_ops);
+
 	return rc;
 }
 
-- 
1.8.3.1



^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [PATCH] net/smc: Fix error path in smc_init
@ 2019-05-14  6:39 ` YueHaibing
  0 siblings, 0 replies; 3+ messages in thread
From: YueHaibing @ 2019-05-14  6:39 UTC (permalink / raw)
  To: davem, ubraun, kgraul, hwippel
  Cc: linux-kernel, netdev, linux-s390, YueHaibing

If register_pernet_subsys success in smc_init,
we should cleanup it in case any other error.

Fixes: 64e28b52c7a6 (net/smc: add pnet table namespace support")
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
---
 net/smc/af_smc.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c
index 6f869ef..7d3207f 100644
--- a/net/smc/af_smc.c
+++ b/net/smc/af_smc.c
@@ -2019,7 +2019,7 @@ static int __init smc_init(void)
 
 	rc = smc_pnet_init();
 	if (rc)
-		return rc;
+		goto out_pernet_subsys;
 
 	rc = smc_llc_init();
 	if (rc) {
@@ -2070,6 +2070,9 @@ static int __init smc_init(void)
 	proto_unregister(&smc_proto);
 out_pnet:
 	smc_pnet_exit();
+out_pernet_subsys:
+	unregister_pernet_subsys(&smc_net_ops);
+
 	return rc;
 }
 
-- 
1.8.3.1

^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [PATCH] net/smc: Fix error path in smc_init
  2019-05-14  6:39 ` YueHaibing
  (?)
@ 2019-05-14 11:13 ` Ursula Braun
  -1 siblings, 0 replies; 3+ messages in thread
From: Ursula Braun @ 2019-05-14 11:13 UTC (permalink / raw)
  To: YueHaibing, davem, kgraul, hwippel; +Cc: linux-kernel, netdev, linux-s390



On 5/14/19 8:39 AM, YueHaibing wrote:
> If register_pernet_subsys success in smc_init,
> we should cleanup it in case any other error.
> 

Thanks, looks good. Your patch will be part of our next patch
submission.

Regards, Ursula

> Fixes: 64e28b52c7a6 (net/smc: add pnet table namespace support")
> Signed-off-by: YueHaibing <yuehaibing@huawei.com>
> ---
>  net/smc/af_smc.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c
> index 6f869ef..7d3207f 100644
> --- a/net/smc/af_smc.c
> +++ b/net/smc/af_smc.c
> @@ -2019,7 +2019,7 @@ static int __init smc_init(void)
>  
>  	rc = smc_pnet_init();
>  	if (rc)
> -		return rc;
> +		goto out_pernet_subsys;
>  
>  	rc = smc_llc_init();
>  	if (rc) {
> @@ -2070,6 +2070,9 @@ static int __init smc_init(void)
>  	proto_unregister(&smc_proto);
>  out_pnet:
>  	smc_pnet_exit();
> +out_pernet_subsys:
> +	unregister_pernet_subsys(&smc_net_ops);
> +
>  	return rc;
>  }
>  
> 


^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-05-14 11:19 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-14  6:39 [PATCH] net/smc: Fix error path in smc_init YueHaibing
2019-05-14  6:39 ` YueHaibing
2019-05-14 11:13 ` Ursula Braun

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.