diff mbox series

[v2,5/7] NFSD: Clean up WRITE arg decoders

Message ID 166171264742.21449.12798598095676580927.stgit@manet.1015granger.net (mailing list archive)
State New, archived
Headers show
Series Fixes for server-side xdr_stream overhaul | expand

Commit Message

Chuck Lever Aug. 28, 2022, 6:50 p.m. UTC 
xdr_stream_subsegment() already returns a boolean value.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---
 fs/nfsd/nfs3xdr.c |    4 +---
 fs/nfsd/nfsxdr.c  |    4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

Comments

Jeff Layton Aug. 29, 2022, 1:49 p.m. UTC | #1 
On Sun, 2022-08-28 at 14:50 -0400, Chuck Lever wrote:
> xdr_stream_subsegment() already returns a boolean value.
> 
> Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
> ---
>  fs/nfsd/nfs3xdr.c |    4 +---
>  fs/nfsd/nfsxdr.c  |    4 +---
>  2 files changed, 2 insertions(+), 6 deletions(-)
> 
> diff --git a/fs/nfsd/nfs3xdr.c b/fs/nfsd/nfs3xdr.c
> index 71e32cf28885..3308dd671ef0 100644
> --- a/fs/nfsd/nfs3xdr.c
> +++ b/fs/nfsd/nfs3xdr.c
> @@ -571,10 +571,8 @@ nfs3svc_decode_writeargs(struct svc_rqst *rqstp, struct xdr_stream *xdr)
>  		args->count = max_blocksize;
>  		args->len = max_blocksize;
>  	}
> -	if (!xdr_stream_subsegment(xdr, &args->payload, args->count))
> -		return false;
>  
> -	return true;
> +	return xdr_stream_subsegment(xdr, &args->payload, args->count);
>  }
>  
>  bool
> diff --git a/fs/nfsd/nfsxdr.c b/fs/nfsd/nfsxdr.c
> index aba8520b4b8b..caf6355b18fa 100644
> --- a/fs/nfsd/nfsxdr.c
> +++ b/fs/nfsd/nfsxdr.c
> @@ -338,10 +338,8 @@ nfssvc_decode_writeargs(struct svc_rqst *rqstp, struct xdr_stream *xdr)
>  		return false;
>  	if (args->len > NFSSVC_MAXBLKSIZE_V2)
>  		return false;
> -	if (!xdr_stream_subsegment(xdr, &args->payload, args->len))
> -		return false;
>  
> -	return true;
> +	return xdr_stream_subsegment(xdr, &args->payload, args->len);
>  }
>  
>  bool
> 
> 

Reviewed-by: Jeff Layton <jlayton@kernel.org>
diff mbox series

Patch

diff --git a/fs/nfsd/nfs3xdr.c b/fs/nfsd/nfs3xdr.c
index 71e32cf28885..3308dd671ef0 100644
--- a/fs/nfsd/nfs3xdr.c
+++ b/fs/nfsd/nfs3xdr.c
@@ -571,10 +571,8 @@  nfs3svc_decode_writeargs(struct svc_rqst *rqstp, struct xdr_stream *xdr)
 		args->count = max_blocksize;
 		args->len = max_blocksize;
 	}
-	if (!xdr_stream_subsegment(xdr, &args->payload, args->count))
-		return false;
 
-	return true;
+	return xdr_stream_subsegment(xdr, &args->payload, args->count);
 }
 
 bool
diff --git a/fs/nfsd/nfsxdr.c b/fs/nfsd/nfsxdr.c
index aba8520b4b8b..caf6355b18fa 100644
--- a/fs/nfsd/nfsxdr.c
+++ b/fs/nfsd/nfsxdr.c
@@ -338,10 +338,8 @@  nfssvc_decode_writeargs(struct svc_rqst *rqstp, struct xdr_stream *xdr)
 		return false;
 	if (args->len > NFSSVC_MAXBLKSIZE_V2)
 		return false;
-	if (!xdr_stream_subsegment(xdr, &args->payload, args->len))
-		return false;
 
-	return true;
+	return xdr_stream_subsegment(xdr, &args->payload, args->len);
 }
 
 bool