diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2011-08-19 11:38:52 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2011-08-26 18:22:52 -0400 |
| commit | c10bd39d800d42adef55ed9016f802677cd0ab5f (patch) | |
| tree | 35b3301cf478bb3fed38eea2928548eea3e332c7 /include/linux/nfsd | |
| parent | 8cfb79134027e96bc11067da00d7ca73e58e69ce (diff) | |
Remove include/linux/nfsd/const.h
Userspace shouldn't have a use for these constants. Nothing here is
used outside fs/nfsd.
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'include/linux/nfsd')
| -rw-r--r-- | include/linux/nfsd/Kbuild | 1 | ||||
| -rw-r--r-- | include/linux/nfsd/const.h | 42 | ||||
| -rw-r--r-- | include/linux/nfsd/nfsfh.h | 7 |
3 files changed, 5 insertions, 45 deletions
diff --git a/include/linux/nfsd/Kbuild b/include/linux/nfsd/Kbuild index 55d1467de3c1..0e528606d46f 100644 --- a/include/linux/nfsd/Kbuild +++ b/include/linux/nfsd/Kbuild | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | header-y += const.h | ||
| 2 | header-y += debug.h | 1 | header-y += debug.h |
| 3 | header-y += export.h | 2 | header-y += export.h |
| 4 | header-y += nfsfh.h | 3 | header-y += nfsfh.h |
diff --git a/include/linux/nfsd/const.h b/include/linux/nfsd/const.h deleted file mode 100644 index feb3764617a4..000000000000 --- a/include/linux/nfsd/const.h +++ /dev/null | |||
| @@ -1,42 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * include/linux/nfsd/const.h | ||
| 3 | * | ||
| 4 | * Various constants related to NFS. | ||
| 5 | * | ||
| 6 | * Copyright (C) 1995-1997 Olaf Kirch <okir@monad.swb.de> | ||
| 7 | */ | ||
| 8 | |||
| 9 | #ifndef _LINUX_NFSD_CONST_H | ||
| 10 | #define _LINUX_NFSD_CONST_H | ||
| 11 | |||
| 12 | #include <linux/nfs.h> | ||
| 13 | #include <linux/nfs2.h> | ||
| 14 | #include <linux/nfs3.h> | ||
| 15 | #include <linux/nfs4.h> | ||
| 16 | |||
| 17 | /* | ||
| 18 | * Maximum blocksizes supported by daemon under various circumstances. | ||
| 19 | */ | ||
| 20 | #define NFSSVC_MAXBLKSIZE RPCSVC_MAXPAYLOAD | ||
| 21 | /* NFSv2 is limited by the protocol specification, see RFC 1094 */ | ||
| 22 | #define NFSSVC_MAXBLKSIZE_V2 (8*1024) | ||
| 23 | |||
| 24 | #ifdef __KERNEL__ | ||
| 25 | |||
| 26 | #include <linux/sunrpc/msg_prot.h> | ||
| 27 | |||
| 28 | /* | ||
| 29 | * Largest number of bytes we need to allocate for an NFS | ||
| 30 | * call or reply. Used to control buffer sizes. We use | ||
| 31 | * the length of v3 WRITE, READDIR and READDIR replies | ||
| 32 | * which are an RPC header, up to 26 XDR units of reply | ||
| 33 | * data, and some page data. | ||
| 34 | * | ||
| 35 | * Note that accuracy here doesn't matter too much as the | ||
| 36 | * size is rounded up to a page size when allocating space. | ||
| 37 | */ | ||
| 38 | #define NFSD_BUFSIZE ((RPC_MAX_HEADER_WITH_AUTH+26)*XDR_UNIT + NFSSVC_MAXBLKSIZE) | ||
| 39 | |||
| 40 | #endif /* __KERNEL__ */ | ||
| 41 | |||
| 42 | #endif /* _LINUX_NFSD_CONST_H */ | ||
diff --git a/include/linux/nfsd/nfsfh.h b/include/linux/nfsd/nfsfh.h index f76d80ccec10..ce4743a26015 100644 --- a/include/linux/nfsd/nfsfh.h +++ b/include/linux/nfsd/nfsfh.h | |||
| @@ -14,11 +14,14 @@ | |||
| 14 | #ifndef _LINUX_NFSD_FH_H | 14 | #ifndef _LINUX_NFSD_FH_H |
| 15 | #define _LINUX_NFSD_FH_H | 15 | #define _LINUX_NFSD_FH_H |
| 16 | 16 | ||
| 17 | # include <linux/types.h> | 17 | #include <linux/types.h> |
| 18 | #include <linux/nfs.h> | ||
| 19 | #include <linux/nfs2.h> | ||
| 20 | #include <linux/nfs3.h> | ||
| 21 | #include <linux/nfs4.h> | ||
| 18 | #ifdef __KERNEL__ | 22 | #ifdef __KERNEL__ |
| 19 | # include <linux/sunrpc/svc.h> | 23 | # include <linux/sunrpc/svc.h> |
| 20 | #endif | 24 | #endif |
| 21 | #include <linux/nfsd/const.h> | ||
| 22 | 25 | ||
| 23 | /* | 26 | /* |
| 24 | * This is the old "dentry style" Linux NFSv2 file handle. | 27 | * This is the old "dentry style" Linux NFSv2 file handle. |
