diff options
| author | Bryan Schumaker <bjschuma@netapp.com> | 2011-11-01 15:24:59 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2011-11-07 21:10:47 -0500 |
| commit | 72083396074035ffa5cf81b6bb3e55f1d615badf (patch) | |
| tree | 65f9092a08828ae068a3950e40f1de1e7d25452d /fs/nfsd/nfsd.h | |
| parent | 114a0a08d46cfb0eefb1a882f7866b7f57bfc5ba (diff) | |
| download | op-kernel-dev-72083396074035ffa5cf81b6bb3e55f1d615badf.zip op-kernel-dev-72083396074035ffa5cf81b6bb3e55f1d615badf.tar.gz | |
NFSD: Call nfsd4_init_slabs() from init_nfsd()
init_nfsd() was calling free_slabs() during cleanup code, but the call
to init_slabs() was hidden in nfsd4_state_init(). This could be
confusing to people unfamiliar with the code.
Signed-off-by: Bryan Schumaker <bjschuma@netapp.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd/nfsd.h')
| -rw-r--r-- | fs/nfsd/nfsd.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/nfsd/nfsd.h b/fs/nfsd/nfsd.h index 58134a2..4e2ee29 100644 --- a/fs/nfsd/nfsd.h +++ b/fs/nfsd/nfsd.h @@ -104,14 +104,16 @@ static inline int nfsd_v4client(struct svc_rqst *rq) */ #ifdef CONFIG_NFSD_V4 extern unsigned int max_delegations; -int nfs4_state_init(void); +void nfs4_state_init(void); +int nfsd4_init_slabs(void); void nfsd4_free_slabs(void); int nfs4_state_start(void); void nfs4_state_shutdown(void); void nfs4_reset_lease(time_t leasetime); int nfs4_reset_recoverydir(char *recdir); #else -static inline int nfs4_state_init(void) { return 0; } +static inline void nfs4_state_init(void) { } +static inline int nfsd4_init_slabs(void) { return 0; } static inline void nfsd4_free_slabs(void) { } static inline int nfs4_state_start(void) { return 0; } static inline void nfs4_state_shutdown(void) { } |
