dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
This commit is contained in:
David Woodhouse 2006-04-25 14:51:45 +01:00
parent eacf17bdbc
commit 997b7af2fe
3 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/linux/nfs.h
View File

@ -7,9 +7,6 @@
#ifndef _LINUX_NFS_H #ifndef _LINUX_NFS_H
#define _LINUX_NFS_H #define _LINUX_NFS_H
#include <linux/sunrpc/msg_prot.h>
#include <linux/string.h>
#define NFS_PROGRAM 100003 #define NFS_PROGRAM 100003
#define NFS_PORT 2049 #define NFS_PORT 2049
#define NFS_MAXDATA 8192 #define NFS_MAXDATA 8192
@ -129,7 +126,10 @@ enum nfs_ftype {
NFFIFO = 8 NFFIFO = 8
}; };
#if defined(__KERNEL__) #ifdef __KERNEL__
#include <linux/sunrpc/msg_prot.h>
#include <linux/string.h>
/* /*
* This is the kernel NFS client file handle representation * This is the kernel NFS client file handle representation
*/ */

6
include/linux/nfs4.h
View File

@ -14,7 +14,6 @@
#define _LINUX_NFS4_H #define _LINUX_NFS4_H
#include <linux/types.h> #include <linux/types.h>
#include <linux/list.h>
#define NFS4_VERIFIER_SIZE 8 #define NFS4_VERIFIER_SIZE 8
#define NFS4_FHSIZE 128 #define NFS4_FHSIZE 128
@ -97,6 +96,9 @@ enum nfs4_acl_whotype {
NFS4_ACL_WHO_EVERYONE, NFS4_ACL_WHO_EVERYONE,
}; };
#ifdef __KERNEL__
#include <linux/list.h>
struct nfs4_ace { struct nfs4_ace {
uint32_t type; uint32_t type;
uint32_t flag; uint32_t flag;
@ -345,8 +347,6 @@ enum lock_type4 {
#define NFS4_MINOR_VERSION 0 #define NFS4_MINOR_VERSION 0
#define NFS4_DEBUG 1 #define NFS4_DEBUG 1
#ifdef __KERNEL__
/* Index of predefined Linux client operations */ /* Index of predefined Linux client operations */
enum { enum {

39
include/linux/nfs_fs.h
View File

@ -9,26 +9,6 @@
#ifndef _LINUX_NFS_FS_H #ifndef _LINUX_NFS_FS_H
#define _LINUX_NFS_FS_H #define _LINUX_NFS_FS_H
#include <linux/config.h>
#include <linux/in.h>
#include <linux/mm.h>
#include <linux/pagemap.h>
#include <linux/rwsem.h>
#include <linux/wait.h>
#include <linux/nfs_fs_sb.h>
#include <linux/sunrpc/debug.h>
#include <linux/sunrpc/auth.h>
#include <linux/sunrpc/clnt.h>
#include <linux/nfs.h>
#include <linux/nfs2.h>
#include <linux/nfs3.h>
#include <linux/nfs4.h>
#include <linux/nfs_xdr.h>
#include <linux/rwsem.h>
#include <linux/mempool.h>
/* /*
* Enable debugging support for nfs client. * Enable debugging support for nfs client.
@ -63,6 +43,25 @@
#define FLUSH_NOCOMMIT 32 /* Don't send the NFSv3/v4 COMMIT */ #define FLUSH_NOCOMMIT 32 /* Don't send the NFSv3/v4 COMMIT */
#ifdef __KERNEL__ #ifdef __KERNEL__
#include <linux/in.h>
#include <linux/mm.h>
#include <linux/pagemap.h>
#include <linux/rwsem.h>
#include <linux/wait.h>
#include <linux/nfs_fs_sb.h>
#include <linux/sunrpc/debug.h>
#include <linux/sunrpc/auth.h>
#include <linux/sunrpc/clnt.h>
#include <linux/nfs.h>
#include <linux/nfs2.h>
#include <linux/nfs3.h>
#include <linux/nfs4.h>
#include <linux/nfs_xdr.h>
#include <linux/rwsem.h>
#include <linux/mempool.h>
/* /*
* NFSv3/v4 Access mode cache entry * NFSv3/v4 Access mode cache entry