| Message ID | 116353ed.95a.18b27c347d9.Coremail.wangkailong@jari.cn (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | NFSD: Clean up errors in nfs4xdr.c | expand |
On Fri, 2023-10-13 at 14:39 +0800, KaiLong Wang wrote: > Fix the following errors reported by checkpatch: > > ERROR: spaces required around that '=' (ctx:VxV) > ERROR: else should follow close brace '}' > > Signed-off-by: KaiLong Wang <wangkailong@jari.cn> > --- > fs/nfsd/nfs4xdr.c | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) > > diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c > index 1cbd2a392302..8b9707957649 100644 > --- a/fs/nfsd/nfs4xdr.c > +++ b/fs/nfsd/nfs4xdr.c > @@ -2432,7 +2432,7 @@ nfsd4_decode_compound(struct nfsd4_compoundargs *argp) > { > struct nfsd4_op *op; > bool cachethis = false; > - int auth_slack= argp->rqstp->rq_auth_slack; > + int auth_slack = argp->rqstp->rq_auth_slack; > int max_reply = auth_slack + 8; /* opcnt, status */ > int readcount = 0; > int readbytes = 0; > @@ -2585,7 +2585,7 @@ static __be32 nfsd4_encode_components_esc(struct xdr_stream *xdr, char sep, > __be32 *p; > __be32 pathlen; > int pathlen_offset; > - int strlen, count=0; > + int strlen, count = 0; > char *str, *end, *next; > > dprintk("nfsd4_encode_components(%s)\n", components); > @@ -2622,8 +2622,7 @@ static __be32 nfsd4_encode_components_esc(struct xdr_stream *xdr, char sep, > return nfserr_resource; > p = xdr_encode_opaque(p, str, strlen); > count++; > - } > - else > + } else > end++; > if (found_esc) > end = next; In general, we don't usually take patches that just clean up whitespace damage or stylistic problems. Doing so makes backporting harder as you end up having to pull in extra patches to fix up minor differences before bringing in substantive patches. If you're fixing a real bug in the same area, then sure, go ahead and fix up the style in the surrounding code, but if these patches don't fix real bugs then I'd suggest not taking them.
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index 1cbd2a392302..8b9707957649 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -2432,7 +2432,7 @@ nfsd4_decode_compound(struct nfsd4_compoundargs *argp) { struct nfsd4_op *op; bool cachethis = false; - int auth_slack= argp->rqstp->rq_auth_slack; + int auth_slack = argp->rqstp->rq_auth_slack; int max_reply = auth_slack + 8; /* opcnt, status */ int readcount = 0; int readbytes = 0; @@ -2585,7 +2585,7 @@ static __be32 nfsd4_encode_components_esc(struct xdr_stream *xdr, char sep, __be32 *p; __be32 pathlen; int pathlen_offset; - int strlen, count=0; + int strlen, count = 0; char *str, *end, *next; dprintk("nfsd4_encode_components(%s)\n", components); @@ -2622,8 +2622,7 @@ static __be32 nfsd4_encode_components_esc(struct xdr_stream *xdr, char sep, return nfserr_resource; p = xdr_encode_opaque(p, str, strlen); count++; - } - else + } else end++; if (found_esc) end = next;
Fix the following errors reported by checkpatch: ERROR: spaces required around that '=' (ctx:VxV) ERROR: else should follow close brace '}' Signed-off-by: KaiLong Wang <wangkailong@jari.cn> --- fs/nfsd/nfs4xdr.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)