2014-05-01 21:15:14

by Kees Cook

Subject: [PATCH] lockd: avoid warning when CONFIG_SYSCTL undefined

When building without CONFIG_SYSCTL, the compiler saw an unused
label. This moves the label into the #ifdef it is used under.

fs/lockd/svc.c: In function ‘init_nlm’:
fs/lockd/svc.c:626:1: warning: label ‘err_sysctl’ defined but not used [-Wunused-label]

Signed-off-by: Kees Cook <[email protected]>
---
fs/lockd/svc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c
index 6bf06a07f3e0..2b431f7266c3 100644
--- a/fs/lockd/svc.c
+++ b/fs/lockd/svc.c
@@ -622,8 +622,8 @@ static int __init init_nlm(void)
err_pernet:
#ifdef CONFIG_SYSCTL
unregister_sysctl_table(nlm_sysctl_table);
-#endif
err_sysctl:
+#endif
return err;
}

--
1.7.9.5


--
Kees Cook
Chrome OS Security

2014-05-04 12:01:10

by J. Bruce Fields

Subject: Re: [PATCH] lockd: avoid warning when CONFIG_SYSCTL undefined

On Thu, May 01, 2014 at 02:15:02PM -0700, Kees Cook wrote:
> When building without CONFIG_SYSCTL, the compiler saw an unused
> label. This moves the label into the #ifdef it is used under.

Thanks, applying.

--b.

>
> fs/lockd/svc.c: In function ‘init_nlm’:
> fs/lockd/svc.c:626:1: warning: label ‘err_sysctl’ defined but not used [-Wunused-label]
>
> Signed-off-by: Kees Cook <[email protected]>
> ---
> fs/lockd/svc.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c
> index 6bf06a07f3e0..2b431f7266c3 100644
> --- a/fs/lockd/svc.c
> +++ b/fs/lockd/svc.c
> @@ -622,8 +622,8 @@ static int __init init_nlm(void)
> err_pernet:
> #ifdef CONFIG_SYSCTL
> unregister_sysctl_table(nlm_sysctl_table);
> -#endif
> err_sysctl:
> +#endif
> return err;
> }
>
> --
> 1.7.9.5
>
>
> --
> Kees Cook
> Chrome OS Security