2021-12-02 08:35:54

by Jiapeng Chong

Subject: [PATCH] NFSD: Fix inconsistent indenting

Eliminate the follow smatch warning:

fs/nfsd/nfs4xdr.c:4766 nfsd4_encode_read_plus_hole() warn: inconsistent
indenting.

Reported-by: Abaci Robot <[email protected]>
Signed-off-by: Jiapeng Chong <[email protected]>
---
fs/nfsd/nfs4xdr.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index c286690..3031126 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -4763,8 +4763,8 @@ static __be32 nfsd4_encode_readv(struct nfsd4_compoundres *resp,
return nfserr_resource;

*p++ = htonl(NFS4_CONTENT_HOLE);
- p = xdr_encode_hyper(p, read->rd_offset);
- p = xdr_encode_hyper(p, count);
+ p = xdr_encode_hyper(p, read->rd_offset);
+ p = xdr_encode_hyper(p, count);

*eof = (read->rd_offset + count) >= f_size;
*maxcount = min_t(unsigned long, count, *maxcount);
--
1.8.3.1

2021-12-02 16:29:31

by Chuck Lever III

Subject: Re: [PATCH] NFSD: Fix inconsistent indenting

> On Dec 2, 2021, at 3:35 AM, Jiapeng Chong <[email protected]> wrote:
>
> Eliminate the follow smatch warning:
>
> fs/nfsd/nfs4xdr.c:4766 nfsd4_encode_read_plus_hole() warn: inconsistent
> indenting.
>
> Reported-by: Abaci Robot <[email protected]>
> Signed-off-by: Jiapeng Chong <[email protected]>
> ---
> fs/nfsd/nfs4xdr.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
> index c286690..3031126 100644
> --- a/fs/nfsd/nfs4xdr.c
> +++ b/fs/nfsd/nfs4xdr.c
> @@ -4763,8 +4763,8 @@ static __be32 nfsd4_encode_readv(struct nfsd4_compoundres *resp,
> return nfserr_resource;
>
> *p++ = htonl(NFS4_CONTENT_HOLE);
> - p = xdr_encode_hyper(p, read->rd_offset);
> - p = xdr_encode_hyper(p, count);
> + p = xdr_encode_hyper(p, read->rd_offset);
> + p = xdr_encode_hyper(p, count);
>
> *eof = (read->rd_offset + count) >= f_size;
> *maxcount = min_t(unsigned long, count, *maxcount);
> --
> 1.8.3.1
>

Thanks! I've included this patch in my for-next topic branch.

--
Chuck Lever