Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Don't include private headers from user-visible parts of include/linux/nfs*.h

Signed-off-by: David Woodhouse <dwmw2@infradead.org>

+26 -27
+4 -4
include/linux/nfs.h
··· 7 7 #ifndef _LINUX_NFS_H 8 8 #define _LINUX_NFS_H 9 9 10 - #include <linux/sunrpc/msg_prot.h> 11 - #include <linux/string.h> 12 - 13 10 #define NFS_PROGRAM 100003 14 11 #define NFS_PORT 2049 15 12 #define NFS_MAXDATA 8192 ··· 126 129 NFFIFO = 8 127 130 }; 128 131 129 - #if defined(__KERNEL__) 132 + #ifdef __KERNEL__ 133 + #include <linux/sunrpc/msg_prot.h> 134 + #include <linux/string.h> 135 + 130 136 /* 131 137 * This is the kernel NFS client file handle representation 132 138 */
+3 -3
include/linux/nfs4.h
··· 14 14 #define _LINUX_NFS4_H 15 15 16 16 #include <linux/types.h> 17 - #include <linux/list.h> 18 17 19 18 #define NFS4_VERIFIER_SIZE 8 20 19 #define NFS4_FHSIZE 128 ··· 95 96 NFS4_ACL_WHO_GROUP, 96 97 NFS4_ACL_WHO_EVERYONE, 97 98 }; 99 + 100 + #ifdef __KERNEL__ 101 + #include <linux/list.h> 98 102 99 103 struct nfs4_ace { 100 104 uint32_t type; ··· 346 344 #define NFSPROC4_COMPOUND 1 347 345 #define NFS4_MINOR_VERSION 0 348 346 #define NFS4_DEBUG 1 349 - 350 - #ifdef __KERNEL__ 351 347 352 348 /* Index of predefined Linux client operations */ 353 349
+19 -20
include/linux/nfs_fs.h
··· 9 9 #ifndef _LINUX_NFS_FS_H 10 10 #define _LINUX_NFS_FS_H 11 11 12 - #include <linux/config.h> 13 - #include <linux/in.h> 14 - #include <linux/mm.h> 15 - #include <linux/pagemap.h> 16 - #include <linux/rwsem.h> 17 - #include <linux/wait.h> 18 - 19 - #include <linux/nfs_fs_sb.h> 20 - 21 - #include <linux/sunrpc/debug.h> 22 - #include <linux/sunrpc/auth.h> 23 - #include <linux/sunrpc/clnt.h> 24 - 25 - #include <linux/nfs.h> 26 - #include <linux/nfs2.h> 27 - #include <linux/nfs3.h> 28 - #include <linux/nfs4.h> 29 - #include <linux/nfs_xdr.h> 30 - #include <linux/rwsem.h> 31 - #include <linux/mempool.h> 32 12 33 13 /* 34 14 * Enable debugging support for nfs client. ··· 43 63 #define FLUSH_NOCOMMIT 32 /* Don't send the NFSv3/v4 COMMIT */ 44 64 45 65 #ifdef __KERNEL__ 66 + #include <linux/in.h> 67 + #include <linux/mm.h> 68 + #include <linux/pagemap.h> 69 + #include <linux/rwsem.h> 70 + #include <linux/wait.h> 71 + 72 + #include <linux/nfs_fs_sb.h> 73 + 74 + #include <linux/sunrpc/debug.h> 75 + #include <linux/sunrpc/auth.h> 76 + #include <linux/sunrpc/clnt.h> 77 + 78 + #include <linux/nfs.h> 79 + #include <linux/nfs2.h> 80 + #include <linux/nfs3.h> 81 + #include <linux/nfs4.h> 82 + #include <linux/nfs_xdr.h> 83 + #include <linux/rwsem.h> 84 + #include <linux/mempool.h> 46 85 47 86 /* 48 87 * NFSv3/v4 Access mode cache entry