From: Trond Myklebust <trondmy@hammerspace.com>
To: "rdunlap@infradead.org" <rdunlap@infradead.org>,
"chuck.lever@oracle.com" <chuck.lever@oracle.com>
Cc: "alsa-devel@alsa-project.org" <alsa-devel@alsa-project.org>,
"linux-usb@vger.kernel.org" <linux-usb@vger.kernel.org>,
"zzy@zzywysm.com" <zzy@zzywysm.com>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"bfields@fieldses.org" <bfields@fieldses.org>,
"target-devel@vger.kernel.org" <target-devel@vger.kernel.org>,
"dave.jiang@intel.com" <dave.jiang@intel.com>,
"linux-scsi@vger.kernel.org" <linux-scsi@vger.kernel.org>,
"linux-nvdimm@lists.01.org" <linux-nvdimm@lists.01.org>,
"vishal.l.verma@intel.com" <vishal.l.verma@intel.com>,
"linux-input@vger.kernel.org" <linux-input@vger.kernel.org>,
"viro@zeniv.linux.org.uk" <viro@zeniv.linux.org.uk>,
"dan.j.williams@intel.com" <dan.j.williams@intel.com>,
"johannes@sipsolutions.net" <johannes@sipsolutions.net>,
"linux-nfs@vger.kernel.org" <linux-nfs@vger.kernel.org>,
"martin.petersen@oracle.com" <martin.petersen@oracle.com>,
"gregkh@linuxfoundation.org" <gregkh@linuxfoundation.org>,
"dmitry.torokhov@gmail.com" <dmitry.torokhov@gmail.com>,
"tiwai@suse.com" <tiwai@suse.com>,
"linux-fsdevel@vger.kernel.org" <linux-fsdevel@vger.kernel.org>,
"akpm@linux-foundation.org" <akpm@linux-foundation.org>,
"torvalds@linux-foundation.org" <torvalds@linux-foundation.org>
Subject: Re: [PATCH 6/9] nfsd: fix empty-body warning in nfs4state.c
Date: Sat, 18 Apr 2020 22:28:26 +0000 [thread overview]
Message-ID: <d2e2f7967804446a825ec0ff61095e6640b5a968.camel@hammerspace.com> (raw)
In-Reply-To: <CDCF7717-7CBC-47CA-9E83-3A18ECB3AB89@oracle.com>
On Sat, 2020-04-18 at 14:45 -0400, Chuck Lever wrote:
> > 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();
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
trond.myklebust@hammerspace.com
next prev parent reply other threads:[~2020-04-19 7:44 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-18 18:41 [RFC PATCH 0/9] fix -Wempty-body build warnings Randy Dunlap
2020-04-18 18:41 ` [RFC PATCH 1/9] kernel.h: add do_empty() macro Randy Dunlap
2020-04-18 18:44 ` Joe Perches
2020-04-18 18:49 ` Randy Dunlap
2020-04-18 22:20 ` Bart Van Assche
2020-04-18 22:24 ` Randy Dunlap
2020-04-18 18:41 ` [PATCH 2/9] fs: fix empty-body warning in posix_acl.c Randy Dunlap
2020-04-18 18:53 ` Linus Torvalds
2020-04-18 18:55 ` Randy Dunlap
2020-04-20 19:58 ` [PATCH 2/9] " Zzy Wysm
2020-04-18 18:41 ` [PATCH 3/9] input: fix empty-body warning in synaptics.c Randy Dunlap
2020-04-18 18:41 ` [PATCH 4/9] sound: fix empty-body warning in vx_core.c Randy Dunlap
2020-04-18 18:41 ` [PATCH 5/9] usb: fix empty-body warning in sysfs.c Randy Dunlap
2020-04-18 18:44 ` Matthew Wilcox
2020-04-18 18:46 ` Randy Dunlap
2020-04-18 19:54 ` Alan Stern
2020-04-21 1:20 ` NeilBrown
2020-04-21 13:58 ` Alan Stern
2020-04-18 18:41 ` [PATCH 6/9] nfsd: fix empty-body warning in nfs4state.c Randy Dunlap
2020-04-18 18:45 ` Chuck Lever
2020-04-18 18:53 ` Joe Perches
2020-04-18 18:57 ` Randy Dunlap
2020-04-18 22:28 ` Trond Myklebust [this message]
2020-04-18 22:32 ` Randy Dunlap
2020-04-18 22:33 ` Chuck Lever
2020-04-19 9:32 ` Sergei Shtylyov
2020-04-18 18:41 ` [PATCH 7/9] drivers/base: fix empty-body warnings in devcoredump.c Randy Dunlap
2020-04-18 18:50 ` Matthew Wilcox
2020-04-18 18:53 ` Randy Dunlap
2020-04-18 18:55 ` Joe Perches
2020-04-18 19:13 ` Matthew Wilcox
2020-04-18 19:16 ` Johannes Berg
2020-04-18 19:15 ` Linus Torvalds
2020-04-19 12:03 ` Greg Kroah-Hartman
2020-04-19 6:02 ` Greg Kroah-Hartman
2020-04-19 6:04 ` Greg Kroah-Hartman
2020-04-18 18:41 ` [PATCH 8/9] dax: fix empty-body warnings in bus.c Randy Dunlap
2020-04-19 8:15 ` Christoph Hellwig
2020-04-18 18:41 ` [PATCH 9/9] target: fix empty-body warning in target_core_pscsi.c Randy Dunlap
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=d2e2f7967804446a825ec0ff61095e6640b5a968.camel@hammerspace.com \
--to=trondmy@hammerspace.com \
--cc=akpm@linux-foundation.org \
--cc=alsa-devel@alsa-project.org \
--cc=bfields@fieldses.org \
--cc=chuck.lever@oracle.com \
--cc=dan.j.williams@intel.com \
--cc=dave.jiang@intel.com \
--cc=dmitry.torokhov@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=johannes@sipsolutions.net \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=linux-nvdimm@lists.01.org \
--cc=linux-scsi@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=rdunlap@infradead.org \
--cc=target-devel@vger.kernel.org \
--cc=tiwai@suse.com \
--cc=torvalds@linux-foundation.org \
--cc=viro@zeniv.linux.org.uk \
--cc=vishal.l.verma@intel.com \
--cc=zzy@zzywysm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).