leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove include/linux/nfsd/const.h

Browse Source 
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>
This commit is contained in:
J. Bruce Fields 2011-08-19 11:38:52 -04:00
parent 8cfb791340
commit c10bd39d80
4 changed files with 31 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
fs/nfsd/nfsd.h
View File

@ -11,13 +11,39 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/mount.h> #include <linux/mount.h>
#include <linux/nfs.h>
#include <linux/nfs2.h>
#include <linux/nfs3.h>
#include <linux/nfs4.h>
#include <linux/sunrpc/msg_prot.h>
#include <linux/nfsd/debug.h> #include <linux/nfsd/debug.h>
#include <linux/nfsd/export.h> #include <linux/nfsd/export.h>
#include <linux/nfsd/stats.h> #include <linux/nfsd/stats.h>
/* /*
* nfsd version * nfsd version
*/ */
#define NFSD_SUPPORTED_MINOR_VERSION 1 #define NFSD_SUPPORTED_MINOR_VERSION 1
/*
* Maximum blocksizes supported by daemon under various circumstances.
*/
#define NFSSVC_MAXBLKSIZE RPCSVC_MAXPAYLOAD
/* NFSv2 is limited by the protocol specification, see RFC 1094 */
#define NFSSVC_MAXBLKSIZE_V2 (8*1024)
/*
* Largest number of bytes we need to allocate for an NFS
* call or reply. Used to control buffer sizes. We use
* the length of v3 WRITE, READDIR and READDIR replies
* which are an RPC header, up to 26 XDR units of reply
* data, and some page data.
*
* Note that accuracy here doesn't matter too much as the
* size is rounded up to a page size when allocating space.
*/
#define NFSD_BUFSIZE ((RPC_MAX_HEADER_WITH_AUTH+26)*XDR_UNIT + NFSSVC_MAXBLKSIZE)
struct readdir_cd { struct readdir_cd {
__be32 err; /* 0, nfserr, or nfserr_eof */ __be32 err; /* 0, nfserr, or nfserr_eof */

1
include/linux/nfsd/Kbuild
View File

@ -1,4 +1,3 @@
header-y += const.h
header-y += debug.h header-y += debug.h
header-y += export.h header-y += export.h
header-y += nfsfh.h header-y += nfsfh.h

42
include/linux/nfsd/const.h
View File

@ -1,42 +0,0 @@
/*
* include/linux/nfsd/const.h
*
* Various constants related to NFS.
*
* Copyright (C) 1995-1997 Olaf Kirch <okir@monad.swb.de>
*/
#ifndef _LINUX_NFSD_CONST_H
#define _LINUX_NFSD_CONST_H
#include <linux/nfs.h>
#include <linux/nfs2.h>
#include <linux/nfs3.h>
#include <linux/nfs4.h>
/*
* Maximum blocksizes supported by daemon under various circumstances.
*/
#define NFSSVC_MAXBLKSIZE RPCSVC_MAXPAYLOAD
/* NFSv2 is limited by the protocol specification, see RFC 1094 */
#define NFSSVC_MAXBLKSIZE_V2 (8*1024)
#ifdef __KERNEL__
#include <linux/sunrpc/msg_prot.h>
/*
* Largest number of bytes we need to allocate for an NFS
* call or reply. Used to control buffer sizes. We use
* the length of v3 WRITE, READDIR and READDIR replies
* which are an RPC header, up to 26 XDR units of reply
* data, and some page data.
*
* Note that accuracy here doesn't matter too much as the
* size is rounded up to a page size when allocating space.
*/
#define NFSD_BUFSIZE ((RPC_MAX_HEADER_WITH_AUTH+26)*XDR_UNIT + NFSSVC_MAXBLKSIZE)
#endif /* __KERNEL__ */
#endif /* _LINUX_NFSD_CONST_H */

5
include/linux/nfsd/nfsfh.h
View File

@ -15,10 +15,13 @@
#define _LINUX_NFSD_FH_H #define _LINUX_NFSD_FH_H
#include <linux/types.h> #include <linux/types.h>
#include <linux/nfs.h>
#include <linux/nfs2.h>
#include <linux/nfs3.h>
#include <linux/nfs4.h>
#ifdef __KERNEL__ #ifdef __KERNEL__
# include <linux/sunrpc/svc.h> # include <linux/sunrpc/svc.h>
#endif #endif
#include <linux/nfsd/const.h>
/* /*
* This is the old "dentry style" Linux NFSv2 file handle. * This is the old "dentry style" Linux NFSv2 file handle.