diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-24 00:12:35 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-24 00:12:35 +0000 |
| commit | 482368b1a8e45430672c58c9a42e7d2004367126 (patch) | |
| tree | ce2a1a567d4d62dee7c2e71a46a99cf72cf1d606 /include/linux/nfsd | |
| parent | e4d0251c6f56ab2e191afb70f80f382793e23f74 (diff) | |
Merge with 2.3.47. Guys, this is buggy as shit. You've been warned.
Diffstat (limited to 'include/linux/nfsd')
| -rw-r--r-- | include/linux/nfsd/nfsd.h | 7 | ||||
| -rw-r--r-- | include/linux/nfsd/xdr3.h | 14 |
2 files changed, 1 insertions, 20 deletions
diff --git a/include/linux/nfsd/nfsd.h b/include/linux/nfsd/nfsd.h index 67456e4d1..5b3c3860c 100644 --- a/include/linux/nfsd/nfsd.h +++ b/include/linux/nfsd/nfsd.h @@ -75,7 +75,7 @@ int nfsd_svc(unsigned short port, int nrservs); /* nfsd/vfs.c */ int fh_lock_parent(struct svc_fh *, struct dentry *); -void nfsd_racache_init(void); +int nfsd_racache_init(int); void nfsd_racache_shutdown(void); int nfsd_lookup(struct svc_rqst *, struct svc_fh *, const char *, int, struct svc_fh *); @@ -182,11 +182,6 @@ extern u32 nfs_ok, */ extern struct timeval nfssvc_boot; -/* - * The number of nfsd threads. - */ -extern int nfsd_nservers; - #endif /* __KERNEL__ */ #endif /* LINUX_NFSD_NFSD_H */ diff --git a/include/linux/nfsd/xdr3.h b/include/linux/nfsd/xdr3.h index 7b787bb93..f3e72151c 100644 --- a/include/linux/nfsd/xdr3.h +++ b/include/linux/nfsd/xdr3.h @@ -296,19 +296,5 @@ int nfs3svc_encode_entry(struct readdir_cd *, const char *name, int nfs3svc_encode_entry_plus(struct readdir_cd *, const char *name, int namlen, off_t offset, ino_t ino); -#ifdef __KERNEL__ - -/* - * This is needed in nfs_readdir for encoding NFS3 directory cookies. - */ -static inline u32 * -enc64(u32 *p, u64 val) -{ - *p++ = htonl(val >> 32); - *p++ = htonl(val & 0xffffffff); - return p; -} - -#endif /* __KERNEL__ */ #endif /* _LINUX_NFSD_XDR3_H */ |