diff options
| -rw-r--r-- | fs/nfsd/nfssvc.c | 3 | ||||
| -rw-r--r-- | include/linux/nfsd/const.h | 10 | ||||
| -rw-r--r-- | include/linux/nfsd/xdr.h | 2 |
3 files changed, 13 insertions, 2 deletions
diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c index 243bc5bbf414..b7010af8eae5 100644 --- a/fs/nfsd/nfssvc.c +++ b/fs/nfsd/nfssvc.c @@ -31,10 +31,11 @@ #include <linux/nfsd/stats.h> #include <linux/nfsd/cache.h> #include <linux/nfsd/xdr.h> +#include <linux/nfsd/xdr3.h> +#include <linux/nfsd/xdr4.h> #include <linux/lockd/bind.h> #define NFSDDBG_FACILITY NFSDDBG_SVC -#define NFSD_BUFSIZE (1024 + NFSSVC_MAXBLKSIZE) /* these signals will be delivered to an nfsd thread * when handling a request diff --git a/include/linux/nfsd/const.h b/include/linux/nfsd/const.h index 623d577ca1b5..b75bb1b38d09 100644 --- a/include/linux/nfsd/const.h +++ b/include/linux/nfsd/const.h @@ -30,6 +30,16 @@ # define NFS_SUPER_MAGIC 0x6969 #endif +#define NFSD_BUFSIZE (1024 + NFSSVC_MAXBLKSIZE) + +#ifdef CONFIG_NFSD_V4 +# define NFSSVC_XDRSIZE NFS4_SVC_XDRSIZE +#elif defined(CONFIG_NFSD_V3) +# define NFSSVC_XDRSIZE NFS3_SVC_XDRSIZE +#else +# define NFSSVC_XDRSIZE NFS2_SVC_XDRSIZE +#endif + #endif /* __KERNEL__ */ #endif /* _LINUX_NFSD_CONST_H */ diff --git a/include/linux/nfsd/xdr.h b/include/linux/nfsd/xdr.h index 5d96579529ed..d81b71fefe6d 100644 --- a/include/linux/nfsd/xdr.h +++ b/include/linux/nfsd/xdr.h @@ -119,7 +119,7 @@ union nfsd_xdrstore { struct nfsd_readdirargs readdir; }; -#define NFSSVC_XDRSIZE sizeof(union nfsd_xdrstore) +#define NFS2_SVC_XDRSIZE sizeof(union nfsd_xdrstore) int nfssvc_decode_void(struct svc_rqst *, u32 *, void *); |