> On Apr 18, 2020, at 2:41 PM, Randy Dunlap <[email protected]> wrote:
>
> Fix gcc empty-body warning when -Wextra is used:
>
> ../fs/nfsd/nfs4state.c:3898:3: warning: suggest braces around empty body in an ‘else’ statement [-Wempty-body]
>
> Signed-off-by: Randy Dunlap <[email protected]>
> Cc: Linus Torvalds <[email protected]>
> Cc: Andrew Morton <[email protected]>
> Cc: "J. Bruce Fields" <[email protected]>
> Cc: Chuck Lever <[email protected]>
> Cc: [email protected]
I have a patch in my queue that addresses this particular warning,
but your change works for me too.
Acked-by: Chuck Lever <[email protected]>
Unless Bruce objects.
> ---
> fs/nfsd/nfs4state.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> --- linux-next-20200417.orig/fs/nfsd/nfs4state.c
> +++ linux-next-20200417/fs/nfsd/nfs4state.c
> @@ -34,6 +34,7 @@
>
> #include <linux/file.h>
> #include <linux/fs.h>
> +#include <linux/kernel.h>
> #include <linux/slab.h>
> #include <linux/namei.h>
> #include <linux/swap.h>
> @@ -3895,7 +3896,7 @@ nfsd4_setclientid(struct svc_rqst *rqstp
> copy_clid(new, conf);
> gen_confirm(new, nn);
> } else /* case 4 (new client) or cases 2, 3 (client reboot): */
> - ;
> + do_empty();
> new->cl_minorversion = 0;
> gen_callback(new, setclid, rqstp);
> add_to_unconfirmed(new);
--
Chuck Lever
On Sat, 2020-04-18 at 14:45 -0400, Chuck Lever wrote:
> > On Apr 18, 2020, at 2:41 PM, Randy Dunlap <[email protected]> wrote:
> >
> > Fix gcc empty-body warning when -Wextra is used:
> >
> > ../fs/nfsd/nfs4state.c:3898:3: warning: suggest braces around empty body in an ‘else’ statement [-Wempty-body]
> >
> > Signed-off-by: Randy Dunlap <[email protected]>
> > Cc: Linus Torvalds <[email protected]>
> > Cc: Andrew Morton <[email protected]>
> > Cc: "J. Bruce Fields" <[email protected]>
> > Cc: Chuck Lever <[email protected]>
> > Cc: [email protected]
>
> I have a patch in my queue that addresses this particular warning,
> but your change works for me too.
>
> Acked-by: Chuck Lever <[email protected]>
>
> Unless Bruce objects.
>
>
> > ---
> > fs/nfsd/nfs4state.c | 3 ++-
> > 1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > --- linux-next-20200417.orig/fs/nfsd/nfs4state.c
> > +++ linux-next-20200417/fs/nfsd/nfs4state.c
> > @@ -34,6 +34,7 @@
> >
> > #include <linux/file.h>
> > #include <linux/fs.h>
> > +#include <linux/kernel.h>
> > #include <linux/slab.h>
> > #include <linux/namei.h>
> > #include <linux/swap.h>
> > @@ -3895,7 +3896,7 @@ nfsd4_setclientid(struct svc_rqst *rqstp
> > copy_clid(new, conf);
> > gen_confirm(new, nn);
> > } else /* case 4 (new client) or cases 2, 3 (client reboot): */
> > - ;
> > + do_empty();
> > new->cl_minorversion = 0;
> > gen_callback(new, setclid, rqstp);
> > add_to_unconfirmed(new);
This empty else seems silly and could likely be better handled by
a comment above the first if, something like:
/* for now only handle case 1: probable callback update */
if (conf && same_verf(&conf->cl_verifier, &clverifier)) {
copy_clid(new, conf);
gen_confirm(new, nn);
}
with no else use.
On 4/18/20 11:53 AM, Joe Perches wrote:
> On Sat, 2020-04-18 at 14:45 -0400, Chuck Lever wrote:
>>> On Apr 18, 2020, at 2:41 PM, Randy Dunlap <[email protected]> wrote:
>>>
>>> Fix gcc empty-body warning when -Wextra is used:
>>>
>>> ../fs/nfsd/nfs4state.c:3898:3: warning: suggest braces around empty body in an ‘else’ statement [-Wempty-body]
>>>
>>> Signed-off-by: Randy Dunlap <[email protected]>
>>> Cc: Linus Torvalds <[email protected]>
>>> Cc: Andrew Morton <[email protected]>
>>> Cc: "J. Bruce Fields" <[email protected]>
>>> Cc: Chuck Lever <[email protected]>
>>> Cc: [email protected]
>>
>> I have a patch in my queue that addresses this particular warning,
>> but your change works for me too.
>>
>> Acked-by: Chuck Lever <[email protected]>
>>
>> Unless Bruce objects.
>>
>>
>>> ---
>>> fs/nfsd/nfs4state.c | 3 ++-
>>> 1 file changed, 2 insertions(+), 1 deletion(-)
>>>
>>> --- linux-next-20200417.orig/fs/nfsd/nfs4state.c
>>> +++ linux-next-20200417/fs/nfsd/nfs4state.c
>>> @@ -34,6 +34,7 @@
>>>
>>> #include <linux/file.h>
>>> #include <linux/fs.h>
>>> +#include <linux/kernel.h>
>>> #include <linux/slab.h>
>>> #include <linux/namei.h>
>>> #include <linux/swap.h>
>>> @@ -3895,7 +3896,7 @@ nfsd4_setclientid(struct svc_rqst *rqstp
>>> copy_clid(new, conf);
>>> gen_confirm(new, nn);
>>> } else /* case 4 (new client) or cases 2, 3 (client reboot): */
>>> - ;
>>> + do_empty();
>>> new->cl_minorversion = 0;
>>> gen_callback(new, setclid, rqstp);
>>> add_to_unconfirmed(new);
>
> This empty else seems silly and could likely be better handled by
> a comment above the first if, something like:
>
> /* for now only handle case 1: probable callback update */
> if (conf && same_verf(&conf->cl_verifier, &clverifier)) {
> copy_clid(new, conf);
> gen_confirm(new, nn);
> }
>
> with no else use.
I'll just let Chuck handle it with his current patch,
whatever it is.
thanks.
--
~Randy
On Sat, 2020-04-18 at 14:45 -0400, Chuck Lever wrote:
> > On Apr 18, 2020, at 2:41 PM, Randy Dunlap <[email protected]>
> > wrote:
> >
> > Fix gcc empty-body warning when -Wextra is used:
> >
> > ../fs/nfsd/nfs4state.c:3898:3: warning: suggest braces around empty
> > body in an ‘else’ statement [-Wempty-body]
> >
> > Signed-off-by: Randy Dunlap <[email protected]>
> > Cc: Linus Torvalds <[email protected]>
> > Cc: Andrew Morton <[email protected]>
> > Cc: "J. Bruce Fields" <[email protected]>
> > Cc: Chuck Lever <[email protected]>
> > Cc: [email protected]
>
> I have a patch in my queue that addresses this particular warning,
> but your change works for me too.
>
> Acked-by: Chuck Lever <[email protected]>
>
> Unless Bruce objects.
>
>
> > ---
> > fs/nfsd/nfs4state.c | 3 ++-
> > 1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > --- linux-next-20200417.orig/fs/nfsd/nfs4state.c
> > +++ linux-next-20200417/fs/nfsd/nfs4state.c
> > @@ -34,6 +34,7 @@
> >
> > #include <linux/file.h>
> > #include <linux/fs.h>
> > +#include <linux/kernel.h>
> > #include <linux/slab.h>
> > #include <linux/namei.h>
> > #include <linux/swap.h>
> > @@ -3895,7 +3896,7 @@ nfsd4_setclientid(struct svc_rqst *rqstp
> > copy_clid(new, conf);
> > gen_confirm(new, nn);
> > } else /* case 4 (new client) or cases 2, 3 (client reboot): */
> > - ;
> > + do_empty();
Urgh... This is just for documentation purposes anyway, so why not just
turn it all into a comment by moving the 'else' into the comment field?
i.e.
} /* else case 4 (.... */
new->cl_minorversion = 0;
> > gen_callback(new, setclid, rqstp);
> > add_to_unconfirmed(new);
>
> --
> Chuck Lever
>
>
--
Trond Myklebust
Linux NFS client maintainer, Hammerspace
[email protected]
On 4/18/20 3:28 PM, Trond Myklebust wrote:
> On Sat, 2020-04-18 at 14:45 -0400, Chuck Lever wrote:
>>> On Apr 18, 2020, at 2:41 PM, Randy Dunlap <[email protected]>
>>> wrote:
>>>
>>> Fix gcc empty-body warning when -Wextra is used:
>>>
>>> ../fs/nfsd/nfs4state.c:3898:3: warning: suggest braces around empty
>>> body in an ‘else’ statement [-Wempty-body]
>>>
>>> Signed-off-by: Randy Dunlap <[email protected]>
>>> Cc: Linus Torvalds <[email protected]>
>>> Cc: Andrew Morton <[email protected]>
>>> Cc: "J. Bruce Fields" <[email protected]>
>>> Cc: Chuck Lever <[email protected]>
>>> Cc: [email protected]
>>
>> I have a patch in my queue that addresses this particular warning,
>> but your change works for me too.
>>
>> Acked-by: Chuck Lever <[email protected]>
>>
>> Unless Bruce objects.
>>
>>
>>> ---
>>> fs/nfsd/nfs4state.c | 3 ++-
>>> 1 file changed, 2 insertions(+), 1 deletion(-)
>>>
>>> --- linux-next-20200417.orig/fs/nfsd/nfs4state.c
>>> +++ linux-next-20200417/fs/nfsd/nfs4state.c
>>> @@ -34,6 +34,7 @@
>>>
>>> #include <linux/file.h>
>>> #include <linux/fs.h>
>>> +#include <linux/kernel.h>
>>> #include <linux/slab.h>
>>> #include <linux/namei.h>
>>> #include <linux/swap.h>
>>> @@ -3895,7 +3896,7 @@ nfsd4_setclientid(struct svc_rqst *rqstp
>>> copy_clid(new, conf);
>>> gen_confirm(new, nn);
>>> } else /* case 4 (new client) or cases 2, 3 (client reboot): */
>>> - ;
>>> + do_empty();
>
> Urgh... This is just for documentation purposes anyway, so why not just
> turn it all into a comment by moving the 'else' into the comment field?
>
> i.e.
> } /* else case 4 (.... */
>
> new->cl_minorversion = 0;
>>> gen_callback(new, setclid, rqstp);
>>> add_to_unconfirmed(new);
Like I said earlier, since Chuck has a patch that addresses this,
let's just go with that.
thanks.
--
~Randy
> On Apr 18, 2020, at 6:32 PM, Randy Dunlap <[email protected]> wrote:
>
> On 4/18/20 3:28 PM, Trond Myklebust wrote:
>> On Sat, 2020-04-18 at 14:45 -0400, Chuck Lever wrote:
>>>> On Apr 18, 2020, at 2:41 PM, Randy Dunlap <[email protected]>
>>>> wrote:
>>>>
>>>> Fix gcc empty-body warning when -Wextra is used:
>>>>
>>>> ../fs/nfsd/nfs4state.c:3898:3: warning: suggest braces around empty
>>>> body in an ‘else’ statement [-Wempty-body]
>>>>
>>>> Signed-off-by: Randy Dunlap <[email protected]>
>>>> Cc: Linus Torvalds <[email protected]>
>>>> Cc: Andrew Morton <[email protected]>
>>>> Cc: "J. Bruce Fields" <[email protected]>
>>>> Cc: Chuck Lever <[email protected]>
>>>> Cc: [email protected]
>>>
>>> I have a patch in my queue that addresses this particular warning,
>>> but your change works for me too.
>>>
>>> Acked-by: Chuck Lever <[email protected]>
>>>
>>> Unless Bruce objects.
>>>
>>>
>>>> ---
>>>> fs/nfsd/nfs4state.c | 3 ++-
>>>> 1 file changed, 2 insertions(+), 1 deletion(-)
>>>>
>>>> --- linux-next-20200417.orig/fs/nfsd/nfs4state.c
>>>> +++ linux-next-20200417/fs/nfsd/nfs4state.c
>>>> @@ -34,6 +34,7 @@
>>>>
>>>> #include <linux/file.h>
>>>> #include <linux/fs.h>
>>>> +#include <linux/kernel.h>
>>>> #include <linux/slab.h>
>>>> #include <linux/namei.h>
>>>> #include <linux/swap.h>
>>>> @@ -3895,7 +3896,7 @@ nfsd4_setclientid(struct svc_rqst *rqstp
>>>> copy_clid(new, conf);
>>>> gen_confirm(new, nn);
>>>> } else /* case 4 (new client) or cases 2, 3 (client reboot): */
>>>> - ;
>>>> + do_empty();
>>
>> Urgh... This is just for documentation purposes anyway, so why not just
>> turn it all into a comment by moving the 'else' into the comment field?
>>
>> i.e.
>> } /* else case 4 (.... */
>>
>> new->cl_minorversion = 0;
>>>> gen_callback(new, setclid, rqstp);
>>>> add_to_unconfirmed(new);
>
> Like I said earlier, since Chuck has a patch that addresses this,
> let's just go with that.
I'll post that patch for review as part of my NFSD for-5.8 patches.
--
Chuck Lever