diff options
author | J. Bruce Fields <bfields@redhat.com> | 2012-07-27 15:49:26 -0400 |
---|---|---|
committer | J. Bruce Fields <bfields@redhat.com> | 2012-08-20 18:39:49 -0400 |
commit | 87f26f9b087643d2e28a5dfbec2e03ac09422fc4 (patch) | |
tree | 8ff5561fa3637597247bbd284032caf337935fc0 | |
parent | 9c0b0ff79935c7e18b2f2f0d66de7086f57c077b (diff) |
nfsd4: declare nfs4_recoverydir properly
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
-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 fa49cff5ee6..009632a68f3 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) | |||
1008 | return nfsd4_write_time(file, buf, size, &nfsd4_grace); | 1008 | return nfsd4_write_time(file, buf, size, &nfsd4_grace); |
1009 | } | 1009 | } |
1010 | 1010 | ||
1011 | extern char *nfs4_recoverydir(void); | ||
1012 | |||
1013 | static ssize_t __write_recoverydir(struct file *file, char *buf, size_t size) | 1011 | static ssize_t __write_recoverydir(struct file *file, char *buf, size_t size) |
1014 | { | 1012 | { |
1015 | char *mesg = buf; | 1013 | char *mesg = buf; |
diff --git a/fs/nfsd/nfsd.h b/fs/nfsd/nfsd.h index 2244222368a..36243a33f19 100644 --- a/fs/nfsd/nfsd.h +++ b/fs/nfsd/nfsd.h | |||
@@ -124,6 +124,7 @@ int nfs4_state_start(void); | |||
124 | void nfs4_state_shutdown(void); | 124 | void nfs4_state_shutdown(void); |
125 | void nfs4_reset_lease(time_t leasetime); | 125 | void nfs4_reset_lease(time_t leasetime); |
126 | int nfs4_reset_recoverydir(char *recdir); | 126 | int nfs4_reset_recoverydir(char *recdir); |
127 | char * nfs4_recoverydir(void); | ||
127 | #else | 128 | #else |
128 | static inline void nfs4_state_init(void) { } | 129 | static inline void nfs4_state_init(void) { } |
129 | static inline int nfsd4_init_slabs(void) { return 0; } | 130 | static inline int nfsd4_init_slabs(void) { return 0; } |
@@ -132,6 +133,7 @@ static inline int nfs4_state_start(void) { return 0; } | |||
132 | static inline void nfs4_state_shutdown(void) { } | 133 | static inline void nfs4_state_shutdown(void) { } |
133 | static inline void nfs4_reset_lease(time_t leasetime) { } | 134 | static inline void nfs4_reset_lease(time_t leasetime) { } |
134 | static inline int nfs4_reset_recoverydir(char *recdir) { return 0; } | 135 | static inline int nfs4_reset_recoverydir(char *recdir) { return 0; } |
136 | static inline char * nfs4_recoverydir(void) {return NULL; } | ||
135 | #endif | 137 | #endif |
136 | 138 | ||
137 | /* | 139 | /* |