diff options
author | J. Bruce Fields <bfields@citi.umich.edu> | 2009-09-15 15:56:50 -0400 |
---|---|---|
committer | J. Bruce Fields <bfields@citi.umich.edu> | 2009-09-15 20:49:33 -0400 |
commit | 29ab23cc5d351658d01a4327d55e9106a73fd04f (patch) | |
tree | 8df00000a93e783f4bc152c20a437338a4f57fde /include/linux/nfsd | |
parent | 5d351754fcf58d1a604aa7cf95c2805e8a098ad9 (diff) |
nfsd4: allow nfs4 state startup to fail
The failure here is pretty unlikely, but we should handle it anyway.
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Diffstat (limited to 'include/linux/nfsd')
-rw-r--r-- | include/linux/nfsd/nfsd.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/nfsd/nfsd.h b/include/linux/nfsd/nfsd.h index 2812ed52669d..24fdf89cea83 100644 --- a/include/linux/nfsd/nfsd.h +++ b/include/linux/nfsd/nfsd.h | |||
@@ -166,7 +166,7 @@ extern int nfsd_max_blksize; | |||
166 | extern unsigned int max_delegations; | 166 | extern unsigned int max_delegations; |
167 | int nfs4_state_init(void); | 167 | int nfs4_state_init(void); |
168 | void nfsd4_free_slabs(void); | 168 | void nfsd4_free_slabs(void); |
169 | void nfs4_state_start(void); | 169 | int nfs4_state_start(void); |
170 | void nfs4_state_shutdown(void); | 170 | void nfs4_state_shutdown(void); |
171 | time_t nfs4_lease_time(void); | 171 | time_t nfs4_lease_time(void); |
172 | void nfs4_reset_lease(time_t leasetime); | 172 | void nfs4_reset_lease(time_t leasetime); |
@@ -174,7 +174,7 @@ int nfs4_reset_recoverydir(char *recdir); | |||
174 | #else | 174 | #else |
175 | static inline int nfs4_state_init(void) { return 0; } | 175 | static inline int nfs4_state_init(void) { return 0; } |
176 | static inline void nfsd4_free_slabs(void) { } | 176 | static inline void nfsd4_free_slabs(void) { } |
177 | static inline void nfs4_state_start(void) { } | 177 | static inline int nfs4_state_start(void) { } |
178 | static inline void nfs4_state_shutdown(void) { } | 178 | static inline void nfs4_state_shutdown(void) { } |
179 | static inline time_t nfs4_lease_time(void) { return 0; } | 179 | static inline time_t nfs4_lease_time(void) { return 0; } |
180 | static inline void nfs4_reset_lease(time_t leasetime) { } | 180 | static inline void nfs4_reset_lease(time_t leasetime) { } |