[v4,06/11] nfs_common: make include/linux/nfs4.h include generated nfs4.h

Commit Message

Jeff Layton Sept. 5, 2024, 12:41 p.m. UTC

Long term, we'd like to move to autogenerating a lot of our XDR code.
Both the client and server include include/linux/nfs4.h. That file is
hand-rolled, and some of the symbols in it conflict with the
autogenerated symbols from xdrgen.

Have include/linux/nfs4.h include the generated
include/linux/sunrpc/xdrgen/nfs4.h and remove the conflicting
definitions from it and nfs_xdr.h.

Signed-off-by: Jeff Layton <[e-mail]>
---
 include/linux/nfs4.h    | 7 +------
 include/linux/nfs_xdr.h | 5 -----
 2 files changed, 1 insertion(+), 11 deletions(-)

Patch

diff --git a/include/linux/nfs4.h b/include/linux/nfs4.h
index 8d7430d9f218..87454d5d3365 100644
--- a/include/linux/nfs4.h
+++ b/include/linux/nfs4.h
@@ -17,6 +17,7 @@ 
 #include <linux/uidgid.h>
 #include <uapi/linux/nfs4.h>
 #include <linux/sunrpc/msg_prot.h>
+#include <linux/sunrpc/xdrgen/nfs4.h>
 
 enum nfs4_acl_whotype {
 	NFS4_ACL_WHO_NAMED = 0,
@@ -512,12 +513,6 @@  enum {
 	FATTR4_XATTR_SUPPORT		= 82,
 };
 
-enum {
-	FATTR4_TIME_DELEG_ACCESS	= 84,
-	FATTR4_TIME_DELEG_MODIFY	= 85,
-	FATTR4_OPEN_ARGUMENTS		= 86,
-};
-
 /*
  * The following internal definitions enable processing the above
  * attribute bits within 32-bit word boundaries.
diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index 45623af3e7b8..d3fe47baf110 100644
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -1315,11 +1315,6 @@  struct nfs4_fsid_present_res {
 
 #endif /* CONFIG_NFS_V4 */
 
-struct nfstime4 {
-	u64	seconds;
-	u32	nseconds;
-};
-
 #ifdef CONFIG_NFS_V4_1
 
 struct pnfs_commit_bucket {