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=-17.2 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham 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 77500C4338F for ; Mon, 23 Aug 2021 16:01:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 53E81613CD for ; Mon, 23 Aug 2021 16:01:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230431AbhHWQCC (ORCPT ); Mon, 23 Aug 2021 12:02:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51394 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229850AbhHWQCB (ORCPT ); Mon, 23 Aug 2021 12:02:01 -0400 Received: from fieldses.org (fieldses.org [IPv6:2600:3c00:e000:2f7::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 28E52C061575 for ; Mon, 23 Aug 2021 09:01:19 -0700 (PDT) Received: by fieldses.org (Postfix, from userid 2815) id 5DA95620D; Mon, 23 Aug 2021 12:01:18 -0400 (EDT) DKIM-Filter: OpenDKIM Filter v2.11.0 fieldses.org 5DA95620D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fieldses.org; s=default; t=1629734478; bh=2C4SM4rplqtueFCBpc1/AKq6qLs35tQ4ype7UBw3yK8=; h=Date:To:Cc:Subject:References:In-Reply-To:From:From; b=yIElZLf9X6nK3eoBDMF4tol7sPJFf55w+frx5ltvDo1W9hny7h+OS5XtNI4KoedF/ jvatS1Cgd0par9s8HlqtmXTd0C8C1rmuDS2WiZ4RVxd9ULOKRIqs3C5FQbZq7OKB37 XITI4952MtZql+4HnfVGT5w2qRaS+GfLtn4iWVio= Date: Mon, 23 Aug 2021 12:01:18 -0400 To: Chuck Lever III Cc: Bruce Fields , Trond Myklebust , Anna Schumaker , "daire@dneg.com" , Linux NFS Mailing List Subject: Re: [PATCH 2/8] nlm: minor nlm_lookup_file argument change Message-ID: <20210823160118.GD883@fieldses.org> References: <1629493326-28336-1-git-send-email-bfields@redhat.com> <1629493326-28336-3-git-send-email-bfields@redhat.com> <77E5AE14-04E1-4C54-BC3C-192FADAF7B96@oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <77E5AE14-04E1-4C54-BC3C-192FADAF7B96@oracle.com> User-Agent: Mutt/1.5.21 (2010-09-15) From: bfields@fieldses.org (J. Bruce Fields) Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org From: "J. Bruce Fields" Subject: [PATCH] nlm: minor style issue Make the assignment separate. Signed-off-by: J. Bruce Fields --- fs/lockd/svc4proc.c | 3 ++- fs/lockd/svcsubs.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) > Style: Replace the "assignment in if statement" in these spots, > bitte? Feel free to fold this in if you'd prefer.--b. diff --git a/fs/lockd/svc4proc.c b/fs/lockd/svc4proc.c index aa8eca7c38a1..bc496bbd696b 100644 --- a/fs/lockd/svc4proc.c +++ b/fs/lockd/svc4proc.c @@ -40,7 +40,8 @@ nlm4svc_retrieve_args(struct svc_rqst *rqstp, struct nlm_args *argp, /* Obtain file pointer. Not used by FREE_ALL call. */ if (filp != NULL) { - if ((error = nlm_lookup_file(rqstp, &file, lock)) != 0) + error = nlm_lookup_file(rqstp, &file, lock); + if (error) goto no_locks; *filp = file; diff --git a/fs/lockd/svcsubs.c b/fs/lockd/svcsubs.c index bbd2bdde4bea..2d62633b39e5 100644 --- a/fs/lockd/svcsubs.c +++ b/fs/lockd/svcsubs.c @@ -117,7 +117,8 @@ nlm_lookup_file(struct svc_rqst *rqstp, struct nlm_file **result, * We have to make sure we have the right credential to open * the file. */ - if ((nfserr = nlmsvc_ops->fopen(rqstp, &lock->fh, &file->f_file)) != 0) { + nfserr = nlmsvc_ops->fopen(rqstp, &lock->fh, &file->f_file); + if (nfserr) { dprintk("lockd: open failed (error %d)\n", nfserr); goto out_free; } -- 2.31.1