lockd: avoid warning when CONFIG_SYSCTL undefined

PATCH In review Kees Cook 2 participants 2 messages May 1, 2014 – May 4, 2014

Subsystems (2)

NFS client NFS server

lore

Share & tools

lore

Kees Cook

author

2014-05-01 21:15 UTC #0 lore raw

PATCH 1/1 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(-)

fs/lockd/svc.c +1 -1

index 6bf06a07f3e0..2b431f7266c3 100644
@@ -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;
 }

Signature · 6 lines

1.7.9.5


-- 
Kees Cook
Chrome OS Security

J. Bruce Fields

2014-05-04 12:01 UTC #1 lore raw

Quoted 2 lines · Kees Cook

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.

Quoted 30 lines

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(-)
fs/lockd/svc.c +1 -1
index 6bf06a07f3e0..2b431f7266c3 100644
@@ -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;
 }
 
Signature · 6 lines
1.7.9.5


-- 
Kees Cook
Chrome OS Security