NFS: Move internal constants out of uapi/linux/nfs_mount.h

When the label says "for internal use only", then it doesn't belong in the 'uapi' subtree.

Trond Myklebust committed 7 years ago

Commit 7b1355b1 parent 11982a72 files · +9 −9Browse files

Unified · Split

2 files

include/linux/nfs_fs_sb.h +9 −0
include/uapi/linux/nfs_mount.h +0 −9

include/linux/nfs_fs_sb.h+9−0

@@ -139,6 +139,15 @@ struct nfs_server { · 138 unmodified lines
139	struct nfs_iostats __percpu io_stats; / I/O statistics */	139	struct nfs_iostats __percpu io_stats; / I/O statistics */
140	atomic_long_t writeback; /* number of writeback pages */	140	atomic_long_t writeback; /* number of writeback pages */
141	int flags; /* various flags */	141	int flags; /* various flags */
		142
		143	/* The following are for internal use only. Also see uapi/linux/nfs_mount.h */
		144	#define NFS_MOUNT_LOOKUP_CACHE_NONEG 0x10000
		145	#define NFS_MOUNT_LOOKUP_CACHE_NONE 0x20000
		146	#define NFS_MOUNT_NORESVPORT 0x40000
		147	#define NFS_MOUNT_LEGACY_INTERFACE 0x80000
		148	#define NFS_MOUNT_LOCAL_FLOCK 0x100000
		149	#define NFS_MOUNT_LOCAL_FCNTL 0x200000
		150
142	unsigned int caps; /* server capabilities */	151	unsigned int caps; /* server capabilities */
143	unsigned int rsize; /* read size */	152	unsigned int rsize; /* read size */
144	unsigned int rpages; /* read size (in pages) */	153	unsigned int rpages; /* read size (in pages) */

include/uapi/linux/nfs_mount.h+0−9

@@ -66,13 +66,4 @@ struct nfs_mount_data { · 65 unmodified lines
66	#define NFS_MOUNT_UNSHARED 0x8000 /* 5 */	66	#define NFS_MOUNT_UNSHARED 0x8000 /* 5 */
67	#define NFS_MOUNT_FLAGMASK 0xFFFF	67	#define NFS_MOUNT_FLAGMASK 0xFFFF
68		68
69	/* The following are for internal use only */
70	#define NFS_MOUNT_LOOKUP_CACHE_NONEG 0x10000
71	#define NFS_MOUNT_LOOKUP_CACHE_NONE 0x20000
72	#define NFS_MOUNT_NORESVPORT 0x40000
73	#define NFS_MOUNT_LEGACY_INTERFACE 0x80000
74
75	#define NFS_MOUNT_LOCAL_FLOCK 0x100000
76	#define NFS_MOUNT_LOCAL_FCNTL 0x200000
77
78	#endif	69	#endif