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

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>

+31 -45
+26
fs/nfsd/nfsd.h
··· 11 11 #include <linux/types.h> 12 12 #include <linux/mount.h> 13 13 14 + #include <linux/nfs.h> 15 + #include <linux/nfs2.h> 16 + #include <linux/nfs3.h> 17 + #include <linux/nfs4.h> 18 + #include <linux/sunrpc/msg_prot.h> 19 + 14 20 #include <linux/nfsd/debug.h> 15 21 #include <linux/nfsd/export.h> 16 22 #include <linux/nfsd/stats.h> 23 + 17 24 /* 18 25 * nfsd version 19 26 */ 20 27 #define NFSD_SUPPORTED_MINOR_VERSION 1 28 + /* 29 + * Maximum blocksizes supported by daemon under various circumstances. 30 + */ 31 + #define NFSSVC_MAXBLKSIZE RPCSVC_MAXPAYLOAD 32 + /* NFSv2 is limited by the protocol specification, see RFC 1094 */ 33 + #define NFSSVC_MAXBLKSIZE_V2 (8*1024) 34 + 35 + 36 + /* 37 + * Largest number of bytes we need to allocate for an NFS 38 + * call or reply. Used to control buffer sizes. We use 39 + * the length of v3 WRITE, READDIR and READDIR replies 40 + * which are an RPC header, up to 26 XDR units of reply 41 + * data, and some page data. 42 + * 43 + * Note that accuracy here doesn't matter too much as the 44 + * size is rounded up to a page size when allocating space. 45 + */ 46 + #define NFSD_BUFSIZE ((RPC_MAX_HEADER_WITH_AUTH+26)*XDR_UNIT + NFSSVC_MAXBLKSIZE) 21 47 22 48 struct readdir_cd { 23 49 __be32 err; /* 0, nfserr, or nfserr_eof */
-1
include/linux/nfsd/Kbuild
··· 1 - header-y += const.h 2 1 header-y += debug.h 3 2 header-y += export.h 4 3 header-y += nfsfh.h
-42
include/linux/nfsd/const.h
··· 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 */
+5 -2
include/linux/nfsd/nfsfh.h
··· 14 14 #ifndef _LINUX_NFSD_FH_H 15 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 22 #ifdef __KERNEL__ 19 23 # include <linux/sunrpc/svc.h> 20 24 #endif 21 - #include <linux/nfsd/const.h> 22 25 23 26 /* 24 27 * This is the old "dentry style" Linux NFSv2 file handle.