diff options
Diffstat (limited to 'include/linux/nfsd')
| -rw-r--r-- | include/linux/nfsd/Kbuild | 4 | ||||
| -rw-r--r-- | include/linux/nfsd/cache.h | 2 | ||||
| -rw-r--r-- | include/linux/nfsd/nfsd.h | 11 |
3 files changed, 10 insertions, 7 deletions
diff --git a/include/linux/nfsd/Kbuild b/include/linux/nfsd/Kbuild index e726fc3a4375..fc972048e572 100644 --- a/include/linux/nfsd/Kbuild +++ b/include/linux/nfsd/Kbuild | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | unifdef-y += const.h | 1 | unifdef-y += const.h |
| 2 | unifdef-y += debug.h | ||
| 2 | unifdef-y += export.h | 3 | unifdef-y += export.h |
| 4 | unifdef-y += nfsfh.h | ||
| 3 | unifdef-y += stats.h | 5 | unifdef-y += stats.h |
| 4 | unifdef-y += syscall.h | 6 | unifdef-y += syscall.h |
| 5 | unifdef-y += nfsfh.h | ||
| 6 | unifdef-y += debug.h | ||
diff --git a/include/linux/nfsd/cache.h b/include/linux/nfsd/cache.h index 7b5d784cc858..04b355c801d8 100644 --- a/include/linux/nfsd/cache.h +++ b/include/linux/nfsd/cache.h | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | #ifndef NFSCACHE_H | 10 | #ifndef NFSCACHE_H |
| 11 | #define NFSCACHE_H | 11 | #define NFSCACHE_H |
| 12 | 12 | ||
| 13 | #ifdef __KERNEL__ | ||
| 14 | #include <linux/in.h> | 13 | #include <linux/in.h> |
| 15 | #include <linux/uio.h> | 14 | #include <linux/uio.h> |
| 16 | 15 | ||
| @@ -77,5 +76,4 @@ void nfsd_reply_cache_shutdown(void); | |||
| 77 | int nfsd_cache_lookup(struct svc_rqst *, int); | 76 | int nfsd_cache_lookup(struct svc_rqst *, int); |
| 78 | void nfsd_cache_update(struct svc_rqst *, int, __be32 *); | 77 | void nfsd_cache_update(struct svc_rqst *, int, __be32 *); |
| 79 | 78 | ||
| 80 | #endif /* __KERNEL__ */ | ||
| 81 | #endif /* NFSCACHE_H */ | 79 | #endif /* NFSCACHE_H */ |
diff --git a/include/linux/nfsd/nfsd.h b/include/linux/nfsd/nfsd.h index 8caf4c4f64e6..21ee440dd3e7 100644 --- a/include/linux/nfsd/nfsd.h +++ b/include/linux/nfsd/nfsd.h | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | #define NFSD_VERSION "0.5" | 27 | #define NFSD_VERSION "0.5" |
| 28 | #define NFSD_SUPPORTED_MINOR_VERSION 0 | 28 | #define NFSD_SUPPORTED_MINOR_VERSION 0 |
| 29 | 29 | ||
| 30 | #ifdef __KERNEL__ | ||
| 31 | /* | 30 | /* |
| 32 | * Special flags for nfsd_permission. These must be different from MAY_READ, | 31 | * Special flags for nfsd_permission. These must be different from MAY_READ, |
| 33 | * MAY_WRITE, and MAY_EXEC. | 32 | * MAY_WRITE, and MAY_EXEC. |
| @@ -56,12 +55,20 @@ extern struct svc_program nfsd_program; | |||
| 56 | extern struct svc_version nfsd_version2, nfsd_version3, | 55 | extern struct svc_version nfsd_version2, nfsd_version3, |
| 57 | nfsd_version4; | 56 | nfsd_version4; |
| 58 | extern struct svc_serv *nfsd_serv; | 57 | extern struct svc_serv *nfsd_serv; |
| 58 | |||
| 59 | extern struct seq_operations nfs_exports_op; | ||
| 60 | |||
| 59 | /* | 61 | /* |
| 60 | * Function prototypes. | 62 | * Function prototypes. |
| 61 | */ | 63 | */ |
| 62 | int nfsd_svc(unsigned short port, int nrservs); | 64 | int nfsd_svc(unsigned short port, int nrservs); |
| 63 | int nfsd_dispatch(struct svc_rqst *rqstp, __be32 *statp); | 65 | int nfsd_dispatch(struct svc_rqst *rqstp, __be32 *statp); |
| 64 | 66 | ||
| 67 | int nfsd_nrthreads(void); | ||
| 68 | int nfsd_nrpools(void); | ||
| 69 | int nfsd_get_nrthreads(int n, int *); | ||
| 70 | int nfsd_set_nrthreads(int n, int *); | ||
| 71 | |||
| 65 | /* nfsd/vfs.c */ | 72 | /* nfsd/vfs.c */ |
| 66 | int fh_lock_parent(struct svc_fh *, struct dentry *); | 73 | int fh_lock_parent(struct svc_fh *, struct dentry *); |
| 67 | int nfsd_racache_init(int); | 74 | int nfsd_racache_init(int); |
| @@ -326,6 +333,4 @@ extern struct timeval nfssvc_boot; | |||
| 326 | 333 | ||
| 327 | #endif /* CONFIG_NFSD_V4 */ | 334 | #endif /* CONFIG_NFSD_V4 */ |
| 328 | 335 | ||
| 329 | #endif /* __KERNEL__ */ | ||
| 330 | |||
| 331 | #endif /* LINUX_NFSD_NFSD_H */ | 336 | #endif /* LINUX_NFSD_NFSD_H */ |
