diff options
author | NeilBrown <neilb@cse.unsw.edu.au> | 2005-06-24 01:03:26 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-24 03:06:31 -0400 |
commit | 76a3550ec50ed86885a10a767ebaebb7c9104721 (patch) | |
tree | 0961d1eb0a61378852cf90f203dba09a22ac012d | |
parent | 7b190fecfa33d72bcf74c9473134c2ad14ae9545 (diff) |
[PATCH] knfsd: nfsd4: rename nfs4_state_init
Somewhat gratuitous rename to simplify following patch.
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | fs/nfsd/nfs4state.c | 6 | ||||
-rw-r--r-- | fs/nfsd/nfssvc.c | 2 | ||||
-rw-r--r-- | include/linux/nfsd/nfsd.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 0f6119714c8c..e00b3472851c 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c | |||
@@ -3185,7 +3185,7 @@ nfs4_check_open_reclaim(clientid_t *clid) | |||
3185 | */ | 3185 | */ |
3186 | 3186 | ||
3187 | static void | 3187 | static void |
3188 | __nfs4_state_init(void) | 3188 | __nfs4_state_start(void) |
3189 | { | 3189 | { |
3190 | int i; | 3190 | int i; |
3191 | time_t grace_time; | 3191 | time_t grace_time; |
@@ -3235,7 +3235,7 @@ __nfs4_state_init(void) | |||
3235 | } | 3235 | } |
3236 | 3236 | ||
3237 | int | 3237 | int |
3238 | nfs4_state_init(void) | 3238 | nfs4_state_start(void) |
3239 | { | 3239 | { |
3240 | int status; | 3240 | int status; |
3241 | 3241 | ||
@@ -3244,7 +3244,7 @@ nfs4_state_init(void) | |||
3244 | status = nfsd4_init_slabs(); | 3244 | status = nfsd4_init_slabs(); |
3245 | if (status) | 3245 | if (status) |
3246 | return status; | 3246 | return status; |
3247 | __nfs4_state_init(); | 3247 | __nfs4_state_start(); |
3248 | nfs4_init = 1; | 3248 | nfs4_init = 1; |
3249 | return 0; | 3249 | return 0; |
3250 | } | 3250 | } |
diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c index 904df604e86b..07b9a065e9da 100644 --- a/fs/nfsd/nfssvc.c +++ b/fs/nfsd/nfssvc.c | |||
@@ -95,7 +95,7 @@ nfsd_svc(unsigned short port, int nrservs) | |||
95 | error = nfsd_racache_init(2*nrservs); | 95 | error = nfsd_racache_init(2*nrservs); |
96 | if (error<0) | 96 | if (error<0) |
97 | goto out; | 97 | goto out; |
98 | error = nfs4_state_init(); | 98 | error = nfs4_state_start(); |
99 | if (error<0) | 99 | if (error<0) |
100 | goto out; | 100 | goto out; |
101 | if (!nfsd_serv) { | 101 | if (!nfsd_serv) { |
diff --git a/include/linux/nfsd/nfsd.h b/include/linux/nfsd/nfsd.h index 4bf931d5ff56..3855fdc5af77 100644 --- a/include/linux/nfsd/nfsd.h +++ b/include/linux/nfsd/nfsd.h | |||
@@ -145,12 +145,12 @@ int nfsd_set_posix_acl(struct svc_fh *, int, struct posix_acl *); | |||
145 | * NFSv4 State | 145 | * NFSv4 State |
146 | */ | 146 | */ |
147 | #ifdef CONFIG_NFSD_V4 | 147 | #ifdef CONFIG_NFSD_V4 |
148 | int nfs4_state_init(void); | 148 | int nfs4_state_start(void); |
149 | void nfs4_state_shutdown(void); | 149 | void nfs4_state_shutdown(void); |
150 | time_t nfs4_lease_time(void); | 150 | time_t nfs4_lease_time(void); |
151 | void nfs4_reset_lease(time_t leasetime); | 151 | void nfs4_reset_lease(time_t leasetime); |
152 | #else | 152 | #else |
153 | static inline int nfs4_state_init(void){return 0;} | 153 | static inline int nfs4_state_start(void){return 0;} |
154 | static inline void nfs4_state_shutdown(void){} | 154 | static inline void nfs4_state_shutdown(void){} |
155 | static inline time_t nfs4_lease_time(void){return 0;} | 155 | static inline time_t nfs4_lease_time(void){return 0;} |
156 | static inline void nfs4_reset_lease(time_t leasetime){} | 156 | static inline void nfs4_reset_lease(time_t leasetime){} |