Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Content-Type: text/plain;
        charset=utf-8
Mime-Version: 1.0 (Mac OS X Mail 12.4 \(3445.104.11\))
Subject: Re: [PATCH 6/9] nfsd: fix empty-body warning in nfs4state.c
From:   Chuck Lever <chuck.lever@oracle.com>
In-Reply-To: <c838fc1d-3973-9cd8-ecc6-8739af514dd0@infradead.org>
Date:   Sat, 18 Apr 2020 18:33:35 -0400
Cc:     Trond Myklebust <trondmy@hammerspace.com>,
        "linux-nvdimm@lists.01.org" <linux-nvdimm@lists.01.org>,
        "linux-usb@vger.kernel.org" <linux-usb@vger.kernel.org>,
        Bruce Fields <bfields@fieldses.org>,
        "linux-input@vger.kernel.org" <linux-input@vger.kernel.org>,
        "torvalds@linux-foundation.org" <torvalds@linux-foundation.org>,
        "zzy@zzywysm.com" <zzy@zzywysm.com>,
        Andrew Morton <akpm@linux-foundation.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "johannes@sipsolutions.net" <johannes@sipsolutions.net>,
        "linux-scsi@vger.kernel.org" <linux-scsi@vger.kernel.org>,
        "vishal.l.verma@intel.com" <vishal.l.verma@intel.com>,
        Linux NFS Mailing List <linux-nfs@vger.kernel.org>,
        "dmitry.torokhov@gmail.com" <dmitry.torokhov@gmail.com>,
        Al Viro <viro@zeniv.linux.org.uk>,
        "perex@perex.cz" <perex@perex.cz>,
        "dave.jiang@intel.com" <dave.jiang@intel.com>,
        "tiwai@suse.com" <tiwai@suse.com>,
        "target-devel@vger.kernel.org" <target-devel@vger.kernel.org>,
        "linux-fsdevel@vger.kernel.org" <linux-fsdevel@vger.kernel.org>,
        "gregkh@linuxfoundation.org" <gregkh@linuxfoundation.org>,
        "Martin K. Petersen" <martin.petersen@oracle.com>,
        "alsa-devel@alsa-project.org" <alsa-devel@alsa-project.org>,
        "dan.j.williams@intel.com" <dan.j.williams@intel.com>
Content-Transfer-Encoding: quoted-printable
Message-Id: <B4067786-F04F-4CE5-B84B-DE5BB0890529@oracle.com>
References: <20200418184111.13401-1-rdunlap@infradead.org>
 <20200418184111.13401-7-rdunlap@infradead.org>
 <CDCF7717-7CBC-47CA-9E83-3A18ECB3AB89@oracle.com>
 <d2e2f7967804446a825ec0ff61095e6640b5a968.camel@hammerspace.com>
 <c838fc1d-3973-9cd8-ecc6-8739af514dd0@infradead.org>
To:     Randy Dunlap <rdunlap@infradead.org>
Sender: linux-nfs-owner@vger.kernel.org
Precedence: bulk


> On Apr 18, 2020, at 6:32 PM, Randy Dunlap <rdunlap@infradead.org> =
wrote:
>=20
> 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@infradead.org>
>>>> wrote:
>>>>=20
>>>> Fix gcc empty-body warning when -Wextra is used:
>>>>=20
>>>> ../fs/nfsd/nfs4state.c:3898:3: warning: suggest braces around empty
>>>> body in an =E2=80=98else=E2=80=99 statement [-Wempty-body]
>>>>=20
>>>> 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
>>>=20
>>> I have a patch in my queue that addresses this particular warning,
>>> but your change works for me too.
>>>=20
>>> Acked-by: Chuck Lever <chuck.lever@oracle.com>
>>>=20
>>> Unless Bruce objects.
>>>=20
>>>=20
>>>> ---
>>>> fs/nfsd/nfs4state.c |    3 ++-
>>>> 1 file changed, 2 insertions(+), 1 deletion(-)
>>>>=20
>>>> --- linux-next-20200417.orig/fs/nfsd/nfs4state.c
>>>> +++ linux-next-20200417/fs/nfsd/nfs4state.c
>>>> @@ -34,6 +34,7 @@
>>>>=20
>>>> #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();
>>=20
>> 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?
>>=20
>> i.e.
>> 	} /* else case 4 (.... */
>>=20
>> 	new->cl_minorversion =3D 0;
>>>> 	gen_callback(new, setclid, rqstp);
>>>> 	add_to_unconfirmed(new);
>=20
> 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