lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] knfsd: nfsd4: rename nfs4_state_init

Browse Source 
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>
This commit is contained in:
NeilBrown
2005-06-23 22:03:26 -07:00
committed by Linus Torvalds
parent 7b190fecfa
commit 76a3550ec5
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
fs/nfsd/nfs4state.c
View File

@@ -3185,7 +3185,7 @@ nfs4_check_open_reclaim(clientid_t *clid)
*/ */
static void static void
__nfs4_state_init(void) __nfs4_state_start(void)
{ {
int i; int i;
time_t grace_time; time_t grace_time;
@@ -3235,7 +3235,7 @@ __nfs4_state_init(void)
} }
int int
nfs4_state_init(void) nfs4_state_start(void)
{ {
int status; int status;
@@ -3244,7 +3244,7 @@ nfs4_state_init(void)
status = nfsd4_init_slabs(); status = nfsd4_init_slabs();
if (status) if (status)
return status; return status;
__nfs4_state_init(); __nfs4_state_start();
nfs4_init = 1; nfs4_init = 1;
return 0; return 0;
} }

2
fs/nfsd/nfssvc.c
View File

@@ -95,7 +95,7 @@ nfsd_svc(unsigned short port, int nrservs)
error = nfsd_racache_init(2*nrservs); error = nfsd_racache_init(2*nrservs);
if (error<0) if (error<0)
goto out; goto out;
error = nfs4_state_init(); error = nfs4_state_start();
if (error<0) if (error<0)
goto out; goto out;
if (!nfsd_serv) { if (!nfsd_serv) {

4
include/linux/nfsd/nfsd.h
View File

@@ -145,12 +145,12 @@ int nfsd_set_posix_acl(struct svc_fh *, int, struct posix_acl *);
* NFSv4 State * NFSv4 State
*/ */
#ifdef CONFIG_NFSD_V4 #ifdef CONFIG_NFSD_V4
int nfs4_state_init(void); int nfs4_state_start(void);
void nfs4_state_shutdown(void); void nfs4_state_shutdown(void);
time_t nfs4_lease_time(void); time_t nfs4_lease_time(void);
void nfs4_reset_lease(time_t leasetime); void nfs4_reset_lease(time_t leasetime);
#else #else
static inline int nfs4_state_init(void){return 0;} static inline int nfs4_state_start(void){return 0;}
static inline void nfs4_state_shutdown(void){} static inline void nfs4_state_shutdown(void){}
static inline time_t nfs4_lease_time(void){return 0;} static inline time_t nfs4_lease_time(void){return 0;}
static inline void nfs4_reset_lease(time_t leasetime){} static inline void nfs4_reset_lease(time_t leasetime){}