lockd: define nlm_port_min,max with CONFIG_SYSCTL
Subsystems (2)
PATCH 1/1 lockd: define nlm_port_min,max with CONFIG_SYSCTL
gcc with W=1 and ! CONFIG_SYSCTLfs/lockd/svc.c:80:51: error: ‘nlm_port_max’ defined but not used [-Werror=unused-const-variable=]
80 | static const int nlm_port_min = 0, nlm_port_max = 65535;
| ^~~~~~~~~~~~fs/lockd/svc.c:80:33: error: ‘nlm_port_min’ defined but not used [-Werror=unused-const-variable=]
80 | static const int nlm_port_min = 0, nlm_port_max = 65535;
| ^~~~~~~~~~~~The only use of these variables is when CONFIG_SYSCTL is defined, so their definition should be likewise conditional.
--- fs/lockd/svc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/lockd/svc.c +1 -1
@@ -77,9 +77,9 @@ static const unsigned long nlm_grace_period_min = 0;static const unsigned long nlm_grace_period_max =240 ;static const unsigned long nlm_timeout_min =3 ;static const unsigned long nlm_timeout_max =20 ; -static const int nlm_port_min =0 , nlm_port_max =65535 ;#ifdef CONFIG_SYSCTL +static const int nlm_port_min =0 , nlm_port_max =65535 ;static struct ctl_table_header * nlm_sysctl_table;#endif
Signature · 1 line
2.27.0
Quoted 21 lines · Tom Rix
gcc with W=1 and !
CONFIG_SYSCTLfs/lockd/svc.c:80:51: error: ‘nlm_port_max’ defined but not used [-Werror=unused-const-variable=]
80 | static const intnlm_port_min= 0,nlm_port_max= 65535;
| ^~~~~~~~~~~~fs/lockd/svc.c:80:33: error: ‘nlm_port_min’ defined but not used [-Werror=unused-const-variable=]80 | static const int nlm_port_min = 0, nlm_port_max = 65535; | ^~~~~~~~~~~~The only use of these variables is when
CONFIG_SYSCTLis defined, so their definition should be likewise conditional.Signed-off-by Tom Rix <[email protected]>--- fs/lockd/svc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)fs/lockd/svc.c +0
-0
fs/lockd/svc.c static const unsigned long nlm_grace_period_min = 0; · line 85
Quoted 10 lines
fs/lockd/svc.c +1
-1@@ -77,9 +77,9 @@ static const unsigned long nlm_grace_period_min = 0;static const unsigned long nlm_grace_period_max =240 ;static const unsigned long nlm_timeout_min =3 ;static const unsigned long nlm_timeout_max =20 ; -static const int nlm_port_min =0 , nlm_port_max =65535 ;#ifdef CONFIG_SYSCTL +static const int nlm_port_min =0 , nlm_port_max =65535 ;static struct ctl_table_header * nlm_sysctl_table;#endif
Quoted 31 lines · Jeff Layton
Quoted 26 lines · Tom Rix
gcc with W=1 and !
CONFIG_SYSCTLfs/lockd/svc.c:80:51: error: ‘nlm_port_max’ defined but not used [-Werror=unused-const-variable=]
80 | static const intnlm_port_min= 0,nlm_port_max= 65535;
| ^~~~~~~~~~~~fs/lockd/svc.c:80:33: error: ‘nlm_port_min’ defined but not used [-Werror=unused-const-variable=]80 | static const int nlm_port_min = 0, nlm_port_max = 65535; | ^~~~~~~~~~~~The only use of these variables is when
CONFIG_SYSCTLis defined, so their definition should be likewise conditional.Signed-off-by Tom Rix <[email protected]>---
fs/lockd/svc.c| 2 +-1 file changed, 1 insertion(+), 1 deletion(-)fs/lockd/svc.c +0
-1@@ -77,9 +77,9 @@ static const unsigned long nlm_grace_period_min = 0;static const unsigned long nlm_grace_period_max =240 ;static const unsigned long nlm_timeout_min =3 ;static const unsigned long nlm_timeout_max =20 ; -static const int nlm_port_min =0 , nlm_port_max =65535 ;
Quoted 7 lines
fs/lockd/svc.c static const unsigned long nlm_grace_period_min = 0; · line 85
Quoted 5 lines
fs/lockd/svc.c +1
-0#ifdef CONFIG_SYSCTL +static const int nlm_port_min =0 , nlm_port_max =65535 ;static struct ctl_table_header * nlm_sysctl_table;#endif Reviewed-by Jeff Layton <[email protected]>
Provisionally applied to nfsd-fixes. Thanks!
--
Chuck Lever