diff mbox

lockd: avoid warning when CONFIG_SYSCTL undefined

Message ID 20140501211502.GA31844@www.outflux.net (mailing list archive)
State New, archived
Headers show

Commit Message

Kees Cook May 1, 2014, 9:15 p.m. UTC
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 <keescook@chromium.org>
---
 fs/lockd/svc.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

J. Bruce Fields May 4, 2014, 12:01 p.m. UTC | #1
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 <keescook@chromium.org>
> ---
>  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
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

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;
 }