2023-05-02 18:10:00

by Tom Rix

Subject: [PATCH] lockd: define nlm_port_min,max with CONFIG_SYSCTL

gcc with W=1 and ! CONFIG_SYSCTL
fs/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.

Signed-off-by: Tom Rix <[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 bb94949bc223..04ba95b83d16 100644
--- a/fs/lockd/svc.c
+++ b/fs/lockd/svc.c
@@ -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

--
2.27.0

2023-05-02 18:23:19

by Jeff Layton

Subject: Re: [PATCH] lockd: define nlm_port_min,max with CONFIG_SYSCTL

On Tue, 2023-05-02 at 14:07 -0400, Tom Rix wrote:
> gcc with W=1 and ! CONFIG_SYSCTL
> fs/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.
>
> Signed-off-by: Tom Rix <[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 bb94949bc223..04ba95b83d16 100644
> --- a/fs/lockd/svc.c
> +++ b/fs/lockd/svc.c
> @@ -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
>

Reviewed-by: Jeff Layton <[email protected]>

2023-05-02 19:59:02

by Chuck Lever III

Subject: Re: [PATCH] lockd: define nlm_port_min,max with CONFIG_SYSCTL

> On May 2, 2023, at 2:16 PM, Jeff Layton <[email protected]> wrote:
>
> On Tue, 2023-05-02 at 14:07 -0400, Tom Rix wrote:
>> gcc with W=1 and ! CONFIG_SYSCTL
>> fs/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.
>>
>> Signed-off-by: Tom Rix <[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 bb94949bc223..04ba95b83d16 100644
>> --- a/fs/lockd/svc.c
>> +++ b/fs/lockd/svc.c
>> @@ -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
>>
>
> Reviewed-by: Jeff Layton <[email protected]>

Provisionally applied to nfsd-fixes. Thanks!


--
Chuck Lever