> On Apr 18, 2020, at 6:32 PM, Randy Dunlap <rdunlap@xxxxxxxxxxxxx> 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 <rdunlap@xxxxxxxxxxxxx> >>>> 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 <rdunlap@xxxxxxxxxxxxx> >>>> Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> >>>> Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> >>>> Cc: "J. Bruce Fields" <bfields@xxxxxxxxxxxx> >>>> Cc: Chuck Lever <chuck.lever@xxxxxxxxxx> >>>> Cc: linux-nfs@xxxxxxxxxxxxxxx >>> >>> I have a patch in my queue that addresses this particular warning, >>> but your change works for me too. >>> >>> Acked-by: Chuck Lever <chuck.lever@xxxxxxxxxx> >>> >>> 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
