Re: [PATCH 2/8] nlm: minor nlm_lookup_file argument change

Chuck Lever III
2021-08-23T17:02:30Z

> On Aug 23, 2021, at 12:01 PM, J. Bruce Fields <bfields@fieldses.org> wrote:
>
> From: "J. Bruce Fields" <bfields@redhat.com>
> Subject: [PATCH] nlm: minor style issue
>
> Make the assignment separate.
>
> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
> ---
> 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.

Squashed. However, this change conflicts with 5/8. I've fixed
that up in my tree.

There are still several outstanding inline comments for 5/8,
in case you missed those.

> 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
>

--
Chuck Lever