From: Chuck Lever <chuck.lever@oracle.com>
Date: Tue, 22 Oct 2024 17:44:08 +0000 (-0400)
Subject: xdrgen: Update the files included in client-side source code
X-Git-Tag: v6.13-rc1~76^2~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=903a7d37d9ea03cfed21040467d3d345d1e6fc76;p=thirdparty%2Fkernel%2Flinux.git

xdrgen: Update the files included in client-side source code

In particular, client-side source code needs the definition of
"struct rpc_procinfo" and does not want header files that pull
in "struct svc_rqst". Otherwise, the source does not compile.

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

diff --git a/tools/net/sunrpc/xdrgen/templates/C/source_top/client.j2 b/tools/net/sunrpc/xdrgen/templates/C/source_top/client.j2
index e3a802cbc4d75..c5518c519854a 100644
--- a/tools/net/sunrpc/xdrgen/templates/C/source_top/client.j2
+++ b/tools/net/sunrpc/xdrgen/templates/C/source_top/client.j2
@@ -3,6 +3,11 @@
 // XDR specification file: {{ filename }}
 // XDR specification modification time: {{ mtime }}
 
-#include <linux/sunrpc/xprt.h>
+#include <linux/types.h>
 
-#include "{{ program }}xdr_gen.h"
+#include <linux/sunrpc/xdr.h>
+#include <linux/sunrpc/xdrgen/_defs.h>
+#include <linux/sunrpc/xdrgen/_builtins.h>
+#include <linux/sunrpc/xdrgen/nlm4.h>
+
+#include <linux/sunrpc/clnt.h>