sunrpc: Change ret code of xdr_stream_decode_opaque_fixed
Subsystems (4)
PATCH v2 1/1 sunrpc: Change ret code of xdr_stream_decode_opaque_fixed
Since the XDR field is fixed in size, the caller already knows how many bytes were decoded, on success. Thus, xdr_stream_decode_opaque_fixed() doesn't need to return that value. And, xdr_stream_decode_u32 and _u64 both return zero on success.
---
Changes in v2:
- Rebased on nfsd-next
- Checks for negative return values are not touched
include/linux/sunrpc/xdr.h | 4 ++-- .../xdrgen/templates/C/typedef/decoder/fixed_length_opaque.j2 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
include/linux/sunrpc/xdr.h +2 -2
@@ -730,7 +730,7 @@ xdr_stream_decode_u64(struct xdr_stream *xdr, __u64 *ptr)* @len: size of buffer pointed to by @ptr * * Return values: -* On success, returns size of object stored in @ptr +* %0 on success * %-EBADMSG on XDR buffer overflow */ static inline ssize_t
@@ -741,7 +741,7 @@ xdr_stream_decode_opaque_fixed(struct xdr_stream *xdr, void *ptr, size_t len)if (unlikely (!p))return -EBADMSG ;xdr_decode_opaque_fixed (p, ptr, len); -return len; +return 0 ; }/**
tools/net/sunrpc/xdrgen/templates/C/typedef/decoder/fixed_length_opaque.j2 +1 -1
@@ -13,5 +13,5 @@ xdrgen_decode_{{ name }}(struct xdr_stream *xdr, {{ classifier }}{{ name }} *ptr {% if annotate %} /* (fixed-length opaque) */ {% endif %} - return xdr_stream_decode_opaque_fixed(xdr, ptr, {{ size }}) >= 0; + return xdr_stream_decode_opaque_fixed(xdr, ptr, {{ size }}) == 0; };
Signature · 1 line
2.43.0
Chuck Lever
maintainerFrom: Chuck Lever <[email protected]>
Quoted 6 lines · Sergey Bashirov
Since the XDR field is fixed in size, the caller already knows how many bytes were decoded, on success. Thus,
xdr_stream_decode_opaque_fixed()doesn't need to return that value. And,xdr_stream_decode_u32and_u64both return zero on success.
Applied to nfsd-testing, thanks!
[1/1] sunrpc: Change ret code of xdr_stream_decode_opaque_fixed
commit: 4f48fa0301a4eceee070baa5ca0f0bb470a2a54e
--
Chuck Lever