From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.7 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8E378C352BE for ; Sat, 18 Apr 2020 18:57:38 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1EBE8221E9 for ; Sat, 18 Apr 2020 18:57:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=alsa-project.org header.i=@alsa-project.org header.b="CDb5Mn5a" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1EBE8221E9 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=perches.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 793151670; Sat, 18 Apr 2020 20:56:46 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 793151670 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1587236256; bh=a13otnzlKU+jTEYYF0oGP+qmTmq6ReI6Pfk3xvUGvp8=; h=Subject:From:To:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=CDb5Mn5aJ4fzgzhByTRXkZsS0KebySzMkyOWtb9LBG3S5hj0Hy3X53VJ9EoGgJ1qE nZv3AiYn8mrd+oZju59TX2LLL6kS3vgi5wMvGvXdE3J5e+a6/imHUB07BhH1oIba/8 UihUeRPC/2OSFYdNGNIQIny39zV8b08w18+XEfAE= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 7BBE4F8021E; Sat, 18 Apr 2020 20:56:12 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id F3FC7F80240; Sat, 18 Apr 2020 20:56:10 +0200 (CEST) Received: from smtprelay.hostedemail.com (smtprelay0171.hostedemail.com [216.40.44.171]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 207CAF8012E for ; Sat, 18 Apr 2020 20:56:04 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 207CAF8012E Received: from filter.hostedemail.com (clb03-v110.bra.tucows.net [216.40.38.60]) by smtprelay06.hostedemail.com (Postfix) with ESMTP id BBBA618018500; Sat, 18 Apr 2020 18:56:01 +0000 (UTC) X-Session-Marker: 6A6F6540706572636865732E636F6D X-HE-Tag: money21_1707d78e8f515 X-Filterd-Recvd-Size: 3611 Received: from XPS-9350.home (unknown [47.151.136.130]) (Authenticated sender: joe@perches.com) by omf03.hostedemail.com (Postfix) with ESMTPA; Sat, 18 Apr 2020 18:55:58 +0000 (UTC) Message-ID: <6c796219ea79d87093409f2dd1d3bf8e4a157ed7.camel@perches.com> Subject: Re: [PATCH 6/9] nfsd: fix empty-body warning in nfs4state.c From: Joe Perches To: Chuck Lever , Randy Dunlap Date: Sat, 18 Apr 2020 11:53:44 -0700 In-Reply-To: References: <20200418184111.13401-1-rdunlap@infradead.org> <20200418184111.13401-7-rdunlap@infradead.org> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.34.1-2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Cc: alsa-devel@alsa-project.org, Dmitry Torokhov , Zzy Wysm , LKML , Bruce Fields , target-devel@vger.kernel.org, Dave Jiang , linux-scsi@vger.kernel.org, linux-nvdimm@lists.01.org, Vishal Verma , linux-input@vger.kernel.org, Al Viro , Dan Williams , Andrew Morton , Linux NFS Mailing List , "Martin K. Petersen" , Greg Kroah-Hartman , linux-usb@vger.kernel.org, Takashi Iwai , linux-fsdevel@vger.kernel.org, Johannes Berg , Linus Torvalds X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" On Sat, 2020-04-18 at 14:45 -0400, Chuck Lever wrote: > > On Apr 18, 2020, at 2:41 PM, Randy Dunlap 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 > > Cc: Linus Torvalds > > Cc: Andrew Morton > > Cc: "J. Bruce Fields" > > Cc: Chuck Lever > > 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 > > 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 > > #include > > +#include > > #include > > #include > > #include > > @@ -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.