* [PATCH] [net-next] sctp: fix unused lable warning
@ 2018-03-28 14:14 ` Arnd Bergmann
0 siblings, 0 replies; 6+ messages in thread
From: Arnd Bergmann @ 2018-03-28 14:14 UTC (permalink / raw)
To: Vlad Yasevich, Neil Horman, David S. Miller
Cc: Arnd Bergmann, Al Viro, linux-sctp, netdev, linux-kernel
The proc file cleanup left a label possibly unused:
net/sctp/protocol.c: In function 'sctp_defaults_init':
net/sctp/protocol.c:1304:1: error: label 'err_init_proc' defined but not used [-Werror=unused-label]
This adds an #ifdef around it to match the respective 'goto'.
Fixes: d47d08c8ca05 ("sctp: use proc_remove_subtree()")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
net/sctp/protocol.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c
index c1c64b78c39d..d685f8456762 100644
--- a/net/sctp/protocol.c
+++ b/net/sctp/protocol.c
@@ -1301,8 +1301,10 @@ static int __net_init sctp_defaults_init(struct net *net)
return 0;
+#ifdef CONFIG_PROC_FS
err_init_proc:
cleanup_sctp_mibs(net);
+#endif
err_init_mibs:
sctp_sysctl_net_unregister(net);
err_sysctl_register:
--
2.9.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH] [net-next] sctp: fix unused lable warning
@ 2018-03-28 14:14 ` Arnd Bergmann
0 siblings, 0 replies; 6+ messages in thread
From: Arnd Bergmann @ 2018-03-28 14:14 UTC (permalink / raw)
To: Vlad Yasevich, Neil Horman, David S. Miller
Cc: Arnd Bergmann, Al Viro, linux-sctp, netdev, linux-kernel
The proc file cleanup left a label possibly unused:
net/sctp/protocol.c: In function 'sctp_defaults_init':
net/sctp/protocol.c:1304:1: error: label 'err_init_proc' defined but not used [-Werror=unused-label]
This adds an #ifdef around it to match the respective 'goto'.
Fixes: d47d08c8ca05 ("sctp: use proc_remove_subtree()")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
net/sctp/protocol.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c
index c1c64b78c39d..d685f8456762 100644
--- a/net/sctp/protocol.c
+++ b/net/sctp/protocol.c
@@ -1301,8 +1301,10 @@ static int __net_init sctp_defaults_init(struct net *net)
return 0;
+#ifdef CONFIG_PROC_FS
err_init_proc:
cleanup_sctp_mibs(net);
+#endif
err_init_mibs:
sctp_sysctl_net_unregister(net);
err_sysctl_register:
--
2.9.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] [net-next] sctp: fix unused lable warning
2018-03-28 14:14 ` Arnd Bergmann
@ 2018-03-28 15:19 ` Neil Horman
-1 siblings, 0 replies; 6+ messages in thread
From: Neil Horman @ 2018-03-28 15:19 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Vlad Yasevich, David S. Miller, Al Viro, linux-sctp, netdev,
linux-kernel
On Wed, Mar 28, 2018 at 04:14:56PM +0200, Arnd Bergmann wrote:
> The proc file cleanup left a label possibly unused:
>
> net/sctp/protocol.c: In function 'sctp_defaults_init':
> net/sctp/protocol.c:1304:1: error: label 'err_init_proc' defined but not used [-Werror=unused-label]
>
> This adds an #ifdef around it to match the respective 'goto'.
>
> Fixes: d47d08c8ca05 ("sctp: use proc_remove_subtree()")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> net/sctp/protocol.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c
> index c1c64b78c39d..d685f8456762 100644
> --- a/net/sctp/protocol.c
> +++ b/net/sctp/protocol.c
> @@ -1301,8 +1301,10 @@ static int __net_init sctp_defaults_init(struct net *net)
>
> return 0;
>
> +#ifdef CONFIG_PROC_FS
> err_init_proc:
> cleanup_sctp_mibs(net);
> +#endif
> err_init_mibs:
> sctp_sysctl_net_unregister(net);
> err_sysctl_register:
> --
> 2.9.0
>
>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] [net-next] sctp: fix unused lable warning
@ 2018-03-28 15:19 ` Neil Horman
0 siblings, 0 replies; 6+ messages in thread
From: Neil Horman @ 2018-03-28 15:19 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Vlad Yasevich, David S. Miller, Al Viro, linux-sctp, netdev,
linux-kernel
On Wed, Mar 28, 2018 at 04:14:56PM +0200, Arnd Bergmann wrote:
> The proc file cleanup left a label possibly unused:
>
> net/sctp/protocol.c: In function 'sctp_defaults_init':
> net/sctp/protocol.c:1304:1: error: label 'err_init_proc' defined but not used [-Werror=unused-label]
>
> This adds an #ifdef around it to match the respective 'goto'.
>
> Fixes: d47d08c8ca05 ("sctp: use proc_remove_subtree()")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> net/sctp/protocol.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c
> index c1c64b78c39d..d685f8456762 100644
> --- a/net/sctp/protocol.c
> +++ b/net/sctp/protocol.c
> @@ -1301,8 +1301,10 @@ static int __net_init sctp_defaults_init(struct net *net)
>
> return 0;
>
> +#ifdef CONFIG_PROC_FS
> err_init_proc:
> cleanup_sctp_mibs(net);
> +#endif
> err_init_mibs:
> sctp_sysctl_net_unregister(net);
> err_sysctl_register:
> --
> 2.9.0
>
>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] [net-next] sctp: fix unused lable warning
2018-03-28 14:14 ` Arnd Bergmann
@ 2018-03-29 18:38 ` David Miller
-1 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2018-03-29 18:38 UTC (permalink / raw)
To: arnd; +Cc: vyasevich, nhorman, viro, linux-sctp, netdev, linux-kernel
From: Arnd Bergmann <arnd@arndb.de>
Date: Wed, 28 Mar 2018 16:14:56 +0200
> The proc file cleanup left a label possibly unused:
>
> net/sctp/protocol.c: In function 'sctp_defaults_init':
> net/sctp/protocol.c:1304:1: error: label 'err_init_proc' defined but not used [-Werror=unused-label]
>
> This adds an #ifdef around it to match the respective 'goto'.
>
> Fixes: d47d08c8ca05 ("sctp: use proc_remove_subtree()")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Applied.
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] [net-next] sctp: fix unused lable warning
@ 2018-03-29 18:38 ` David Miller
0 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2018-03-29 18:38 UTC (permalink / raw)
To: arnd; +Cc: vyasevich, nhorman, viro, linux-sctp, netdev, linux-kernel
From: Arnd Bergmann <arnd@arndb.de>
Date: Wed, 28 Mar 2018 16:14:56 +0200
> The proc file cleanup left a label possibly unused:
>
> net/sctp/protocol.c: In function 'sctp_defaults_init':
> net/sctp/protocol.c:1304:1: error: label 'err_init_proc' defined but not used [-Werror=unused-label]
>
> This adds an #ifdef around it to match the respective 'goto'.
>
> Fixes: d47d08c8ca05 ("sctp: use proc_remove_subtree()")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Applied.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-03-29 18:38 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-03-28 14:14 [PATCH] [net-next] sctp: fix unused lable warning Arnd Bergmann
2018-03-28 14:14 ` Arnd Bergmann
2018-03-28 15:19 ` Neil Horman
2018-03-28 15:19 ` Neil Horman
2018-03-29 18:38 ` David Miller
2018-03-29 18:38 ` David Miller
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.