Return-Path: Received: from mout.web.de ([212.227.15.3]:61348 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754986AbeAMOE4 (ORCPT ); Sat, 13 Jan 2018 09:04:56 -0500 Subject: [PATCH 2/2] nfsd: Adjust four function calls together with a variable assignment From: SF Markus Elfring To: linux-nfs@vger.kernel.org, Jeff Layton , "J. Bruce Fields" Cc: LKML , kernel-janitors@vger.kernel.org References: <43df7d8b-f37e-91ca-9c8c-96e318adeb4f@users.sourceforge.net> Message-ID: <9f4ab241-a84a-0db5-6915-9e72bdbc24b0@users.sourceforge.net> Date: Sat, 13 Jan 2018 15:04:51 +0100 MIME-Version: 1.0 In-Reply-To: <43df7d8b-f37e-91ca-9c8c-96e318adeb4f@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Sender: linux-nfs-owner@vger.kernel.org List-ID: From: Markus Elfring Date: Sat, 13 Jan 2018 14:40:44 +0100 The script "checkpatch.pl" pointed information out like the following. ERROR: do not use assignment in if condition Thus fix the affected source code places. Signed-off-by: Markus Elfring --- fs/nfsd/export.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/fs/nfsd/export.c b/fs/nfsd/export.c index 3b035a87e4c4..8ab1383bf3ea 100644 --- a/fs/nfsd/export.c +++ b/fs/nfsd/export.c @@ -90,7 +90,8 @@ static int expkey_parse(struct cache_detail *cd, char *mesg, int mlen) goto out; err = -EINVAL; - if ((len=qword_get(&mesg, buf, PAGE_SIZE)) <= 0) + len = qword_get(&mesg, buf, PAGE_SIZE); + if (len <= 0) goto out; err = -ENOENT; @@ -100,7 +101,8 @@ static int expkey_parse(struct cache_detail *cd, char *mesg, int mlen) dprintk("found domain %s\n", buf); err = -EINVAL; - if ((len=qword_get(&mesg, buf, PAGE_SIZE)) <= 0) + len = qword_get(&mesg, buf, PAGE_SIZE); + if (len <= 0) goto out; fsidtype = simple_strtoul(buf, &ep, 10); if (*ep) @@ -108,7 +110,9 @@ static int expkey_parse(struct cache_detail *cd, char *mesg, int mlen) dprintk("found fsidtype %d\n", fsidtype); if (key_len(fsidtype)==0) /* invalid type */ goto out; - if ((len=qword_get(&mesg, buf, PAGE_SIZE)) <= 0) + + len = qword_get(&mesg, buf, PAGE_SIZE); + if (len <= 0) goto out; dprintk("found fsid length %d\n", len); if (len != key_len(fsidtype)) @@ -538,7 +542,8 @@ static int svc_export_parse(struct cache_detail *cd, char *mesg, int mlen) /* path */ err = -EINVAL; - if ((len = qword_get(&mesg, buf, PAGE_SIZE)) <= 0) + len = qword_get(&mesg, buf, PAGE_SIZE); + if (len <= 0) goto out1; err = kern_path(buf, 0, &exp.ex_path); -- 2.15.1