diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-09-17 17:03:06 +1000 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2009-09-17 11:30:32 -0400 |
| commit | c0826574ddc0df486ecfc2d655e08904c6513209 (patch) | |
| tree | 2de65b3a490a1ef336073b568f05b8ceb8b9c2d5 | |
| parent | b09333c4644d173d95b8f3fd4f1dc4375d91be2a (diff) | |
| download | linux-stable-c0826574ddc0df486ecfc2d655e08904c6513209.tar.gz linux-stable-c0826574ddc0df486ecfc2d655e08904c6513209.tar.bz2 linux-stable-c0826574ddc0df486ecfc2d655e08904c6513209.zip | |
nfsd: return success for non-NFS4 nfs4_state_start
Today's linux-next build (sparc64_defconfig) failed like this:
In file included from arch/sparc/kernel/sys_sparc32.c:32:
include/linux/nfsd/nfsd.h: In function 'nfs4_state_start':
include/linux/nfsd/nfsd.h:177: error: no return statement in function returning non-void
Caused by commit 29ab23cc5d351658d01a4327d55e9106a73fd04f ("nfsd4: allow
nfs4 state startup to fail"). Please, if you add code that depends on a
CONFIG option, build with that option enabled and disabled.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
| -rw-r--r-- | include/linux/nfsd/nfsd.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/nfsd/nfsd.h b/include/linux/nfsd/nfsd.h index 24fdf89cea83..03bbe9039104 100644 --- a/include/linux/nfsd/nfsd.h +++ b/include/linux/nfsd/nfsd.h @@ -174,7 +174,7 @@ int nfs4_reset_recoverydir(char *recdir); #else static inline int nfs4_state_init(void) { return 0; } static inline void nfsd4_free_slabs(void) { } -static inline int nfs4_state_start(void) { } +static inline int nfs4_state_start(void) { return 0; } static inline void nfs4_state_shutdown(void) { } static inline time_t nfs4_lease_time(void) { return 0; } static inline void nfs4_reset_lease(time_t leasetime) { } |