Messages in this thread | | | Subject | Re: [PATCH 6/9] nfsd: fix empty-body warning in nfs4state.c | From | Chuck Lever <> | Date | Sat, 18 Apr 2020 14:45:55 -0400 |
| |
> On Apr 18, 2020, at 2:41 PM, Randy Dunlap <rdunlap@infradead.org> 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@infradead.org> > Cc: Linus Torvalds <torvalds@linux-foundation.org> > Cc: Andrew Morton <akpm@linux-foundation.org> > Cc: "J. Bruce Fields" <bfields@fieldses.org> > Cc: Chuck Lever <chuck.lever@oracle.com> > Cc: linux-nfs@vger.kernel.org
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@oracle.com>
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
| |