diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2012-07-27 21:49:26 +0200 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2012-08-21 00:39:49 +0200 |
| commit | 87f26f9b087643d2e28a5dfbec2e03ac09422fc4 (patch) | |
| tree | 8ff5561fa3637597247bbd284032caf337935fc0 /fs | |
| parent | nfsd4: nfsaclsvc_encode_voidres static (diff) | |
| download | linux-87f26f9b087643d2e28a5dfbec2e03ac09422fc4.tar.xz linux-87f26f9b087643d2e28a5dfbec2e03ac09422fc4.zip | |
nfsd4: declare nfs4_recoverydir properly
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nfsd/nfsctl.c | 2 | ||||
| -rw-r--r-- | fs/nfsd/nfsd.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c index fa49cff5ee65..009632a68f31 100644 --- a/fs/nfsd/nfsctl.c +++ b/fs/nfsd/nfsctl.c @@ -1008,8 +1008,6 @@ static ssize_t write_gracetime(struct file *file, char *buf, size_t size) return nfsd4_write_time(file, buf, size, &nfsd4_grace); } -extern char *nfs4_recoverydir(void); - static ssize_t __write_recoverydir(struct file *file, char *buf, size_t size) { char *mesg = buf; diff --git a/fs/nfsd/nfsd.h b/fs/nfsd/nfsd.h index 2244222368ab..36243a33f193 100644 --- a/fs/nfsd/nfsd.h +++ b/fs/nfsd/nfsd.h @@ -124,6 +124,7 @@ int nfs4_state_start(void); void nfs4_state_shutdown(void); void nfs4_reset_lease(time_t leasetime); int nfs4_reset_recoverydir(char *recdir); +char * nfs4_recoverydir(void); #else static inline void nfs4_state_init(void) { } static inline int nfsd4_init_slabs(void) { return 0; } @@ -132,6 +133,7 @@ static inline int nfs4_state_start(void) { return 0; } static inline void nfs4_state_shutdown(void) { } static inline void nfs4_reset_lease(time_t leasetime) { } static inline int nfs4_reset_recoverydir(char *recdir) { return 0; } +static inline char * nfs4_recoverydir(void) {return NULL; } #endif /* |