From: Chuck Lever <chuck.lever@oracle.com>
Date: Tue, 10 Sep 2024 19:51:46 +0000 (-0400)
Subject: xdrgen: typedefs should use the built-in string and opaque functions
X-Git-Tag: v6.12-rc1~97^2~1
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=fed8a17c61ffa2ba53dc749068b6f07ecf40e3bf;p=linux-block.git

xdrgen: typedefs should use the built-in string and opaque functions

'typedef opaque yada<XYZ>' should use xdrgen's built-in opaque
encoder and decoder, to enable better compiler optimization.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---

diff --git a/tools/net/sunrpc/xdrgen/templates/C/typedef/decoder/variable_length_opaque.j2 b/tools/net/sunrpc/xdrgen/templates/C/typedef/decoder/variable_length_opaque.j2
index c1b7ad84f99c..f28f8b228ad5 100644
--- a/tools/net/sunrpc/xdrgen/templates/C/typedef/decoder/variable_length_opaque.j2
+++ b/tools/net/sunrpc/xdrgen/templates/C/typedef/decoder/variable_length_opaque.j2
@@ -13,5 +13,5 @@ xdrgen_decode_{{ name }}(struct xdr_stream *xdr, {{ classifier }}{{ name }} *ptr
 {% if annotate %}
 	/* (variable-length opaque) */
 {% endif %}
-	return xdr_stream_decode_opaque(xdr, ptr->data, ptr->len) >= 0;
+	return xdrgen_decode_opaque(xdr, ptr, {{ maxsize }});
 };
diff --git a/tools/net/sunrpc/xdrgen/templates/C/typedef/decoder/variable_length_string.j2 b/tools/net/sunrpc/xdrgen/templates/C/typedef/decoder/variable_length_string.j2
index 937286d76688..56c5a17d6a70 100644
--- a/tools/net/sunrpc/xdrgen/templates/C/typedef/decoder/variable_length_string.j2
+++ b/tools/net/sunrpc/xdrgen/templates/C/typedef/decoder/variable_length_string.j2
@@ -13,5 +13,5 @@ xdrgen_decode_{{ name }}(struct xdr_stream *xdr, {{ classifier }}{{ name }} *ptr
 {% if annotate %}
 	/* (variable-length string) */
 {% endif %}
-	return xdr_stream_decode_opaque(xdr, ptr->data, ptr->len) >= 0;
+	return xdrgen_decode_string(xdr, ptr, {{ maxsize }});
 };