[PATCH v1 09/17] NFSD: Remove '#include "xdr.h"' from nfs2acl.c

[Chuck Lever <cel@kernel.org>]

To avoid collisions of definitions when nfs2xdr_gen.h is included
in nfs2acl.c, remove the xdr.h head from nfs2acl.c, copying in only
the definitions from xdr.h that are needed.

The duplication is temporary.

Signed-off-by: Chuck Lever <cel@kernel.org>
---
 fs/nfsd/nfs2acl.c | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/fs/nfsd/nfs2acl.c b/fs/nfsd/nfs2acl.c
index b079a3ded78f..777d754f016a 100644
--- a/fs/nfsd/nfs2acl.c
+++ b/fs/nfsd/nfs2acl.c
@@ -12,13 +12,18 @@
 #include <uapi/linux/nfsacl.h>
 #include <linux/gfp.h>
 #include "cache.h"
-#include "xdr.h"
 #include "vfs.h"
 
 #define NFSDDBG_FACILITY		NFSDDBG_PROC
 
 struct posix_acl;
 
+struct nfsd_attrstat {
+	__be32			status;
+	struct svc_fh		fh;
+	struct kstat		stat;
+};
+
 struct nfsd3_getaclargs {
 	struct svc_fh		fh;
 	__u32			mask;
@@ -52,6 +57,16 @@ struct nfsd3_accessres {
 	struct kstat		stat;
 };
 
+bool nfssvc_decode_fhandleargs(struct svc_rqst *rqstp, struct xdr_stream *xdr);
+bool nfssvc_encode_attrstatres(struct svc_rqst *rqstp, struct xdr_stream *xdr);
+
+void nfssvc_release_attrstat(struct svc_rqst *rqstp);
+
+bool svcxdr_decode_fhandle(struct xdr_stream *xdr, struct svc_fh *fhp);
+bool svcxdr_encode_stat(struct xdr_stream *xdr, __be32 status);
+bool svcxdr_encode_fattr(struct svc_rqst *rqstp, struct xdr_stream *xdr,
+			 const struct svc_fh *fhp, const struct kstat *stat);
+
 /*
  * These maps are identical to the NFSv3 maps (nfs3proc.c). This enables
  * the behavior of the two versions to diverge if needed.
-- 
2.56.0