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.

Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>

diff --git a/include/linux/nfs_fs_sb.h b/include/linux/nfs_fs_sb.h
index c827d31298cc379e3bdb07810f98913b24737301..013ac5b54a09ca9bab6e4bd5d8bd669e55049274 100644 (file)
--- a/include/linux/nfs_fs_sb.h
+++ b/include/linux/nfs_fs_sb.h
@@ -139,6 +139,15 @@ struct nfs_server {
        struct nfs_iostats __percpu *io_stats;  /* I/O statistics */
        atomic_long_t           writeback;      /* number of writeback pages */
        int                     flags;          /* various flags */
+
+/* The following are for internal use only. Also see uapi/linux/nfs_mount.h */
+#define NFS_MOUNT_LOOKUP_CACHE_NONEG   0x10000
+#define NFS_MOUNT_LOOKUP_CACHE_NONE    0x20000
+#define NFS_MOUNT_NORESVPORT           0x40000
+#define NFS_MOUNT_LEGACY_INTERFACE     0x80000
+#define NFS_MOUNT_LOCAL_FLOCK          0x100000
+#define NFS_MOUNT_LOCAL_FCNTL          0x200000
+
        unsigned int            caps;           /* server capabilities */
        unsigned int            rsize;          /* read size */
        unsigned int            rpages;         /* read size (in pages) */

diff --git a/include/uapi/linux/nfs_mount.h b/include/uapi/linux/nfs_mount.h
index e44e00616ab5f6fbbd9027e07d898e36525c741e..e3bcfc6aa3b0aced8df1a39a350bafe1018e48d4 100644 (file)
--- a/include/uapi/linux/nfs_mount.h
+++ b/include/uapi/linux/nfs_mount.h
@@ -66,13 +66,4 @@ struct nfs_mount_data {
 #define NFS_MOUNT_UNSHARED     0x8000  /* 5 */
 #define NFS_MOUNT_FLAGMASK     0xFFFF
 
-/* The following are for internal use only */
-#define NFS_MOUNT_LOOKUP_CACHE_NONEG   0x10000
-#define NFS_MOUNT_LOOKUP_CACHE_NONE    0x20000
-#define NFS_MOUNT_NORESVPORT           0x40000
-#define NFS_MOUNT_LEGACY_INTERFACE     0x80000
-
-#define NFS_MOUNT_LOCAL_FLOCK  0x100000
-#define NFS_MOUNT_LOCAL_FCNTL  0x200000
-
 #endif