2023-09-28 02:53:24

by KaiLong Wang

Subject: [PATCH] nfsd: Clean up errors in nfs3proc.c

Fix the following errors reported by checkpatch:

ERROR: need consistent spacing around '+' (ctx:WxV)
ERROR: spaces required around that '?' (ctx:VxW)

Signed-off-by: KaiLong Wang <[email protected]>
---
fs/nfsd/nfs3proc.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/nfsd/nfs3proc.c b/fs/nfsd/nfs3proc.c
index 268ef57751c4..3dc1386e30bc 100644
--- a/fs/nfsd/nfs3proc.c
+++ b/fs/nfsd/nfs3proc.c
@@ -171,7 +171,7 @@ nfsd3_proc_read(struct svc_rqst *rqstp)
* + 1 (xdr opaque byte count) = 26
*/
resp->count = argp->count;
- svc_reserve_auth(rqstp, ((1 + NFS3_POST_OP_ATTR_WORDS + 3)<<2) + resp->count +4);
+ svc_reserve_auth(rqstp, ((1 + NFS3_POST_OP_ATTR_WORDS + 3)<<2) + resp->count + 4);

fh_copy(&resp->fh, &argp->fh);
resp->status = nfsd_read(rqstp, &resp->fh, argp->offset,
@@ -194,7 +194,7 @@ nfsd3_proc_write(struct svc_rqst *rqstp)
SVCFH_fmt(&argp->fh),
argp->len,
(unsigned long long) argp->offset,
- argp->stable? " stable" : "");
+ argp->stable ? " stable" : "");

resp->status = nfserr_fbig;
if (argp->offset > (u64)OFFSET_MAX ||
--
2.17.1

2023-09-28 16:41:28

by Chuck Lever III

Subject: Re: [PATCH] nfsd: Clean up errors in nfs3proc.c

On Wed, Sep 27, 2023 at 10:51:55PM -0400, KaiLong Wang wrote:
> Fix the following errors reported by checkpatch:
>
> ERROR: need consistent spacing around '+' (ctx:WxV)
> ERROR: spaces required around that '?' (ctx:VxW)
>
> Signed-off-by: KaiLong Wang <[email protected]>
> ---
> fs/nfsd/nfs3proc.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)

I've applied 1/4, 2/4, and 4/4. I'm still debating whether to apply
3/4, that "char *<tab>variable" style is used everywhere (though
I kind of agree it's an eye-sore).


> diff --git a/fs/nfsd/nfs3proc.c b/fs/nfsd/nfs3proc.c
> index 268ef57751c4..3dc1386e30bc 100644
> --- a/fs/nfsd/nfs3proc.c
> +++ b/fs/nfsd/nfs3proc.c
> @@ -171,7 +171,7 @@ nfsd3_proc_read(struct svc_rqst *rqstp)
> * + 1 (xdr opaque byte count) = 26
> */
> resp->count = argp->count;
> - svc_reserve_auth(rqstp, ((1 + NFS3_POST_OP_ATTR_WORDS + 3)<<2) + resp->count +4);
> + svc_reserve_auth(rqstp, ((1 + NFS3_POST_OP_ATTR_WORDS + 3)<<2) + resp->count + 4);

Since this line is already longer than 80 characters, I updated
this patch to split it.


> fh_copy(&resp->fh, &argp->fh);
> resp->status = nfsd_read(rqstp, &resp->fh, argp->offset,
> @@ -194,7 +194,7 @@ nfsd3_proc_write(struct svc_rqst *rqstp)
> SVCFH_fmt(&argp->fh),
> argp->len,
> (unsigned long long) argp->offset,
> - argp->stable? " stable" : "");
> + argp->stable ? " stable" : "");
>
> resp->status = nfserr_fbig;
> if (argp->offset > (u64)OFFSET_MAX ||
> --
> 2.17.1

--
Chuck Lever