[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>
This commit is contained in:
parent
7b190fecfa
commit
76a3550ec5
|
@ -3185,7 +3185,7 @@ nfs4_check_open_reclaim(clientid_t *clid)
|
|||
*/
|
||||
|
||||
static void
|
||||
__nfs4_state_init(void)
|
||||
__nfs4_state_start(void)
|
||||
{
|
||||
int i;
|
||||
time_t grace_time;
|
||||
|
@ -3235,7 +3235,7 @@ __nfs4_state_init(void)
|
|||
}
|
||||
|
||||
int
|
||||
nfs4_state_init(void)
|
||||
nfs4_state_start(void)
|
||||
{
|
||||
int status;
|
||||
|
||||
|
@ -3244,7 +3244,7 @@ nfs4_state_init(void)
|
|||
status = nfsd4_init_slabs();
|
||||
if (status)
|
||||
return status;
|
||||
__nfs4_state_init();
|
||||
__nfs4_state_start();
|
||||
nfs4_init = 1;
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -95,7 +95,7 @@ nfsd_svc(unsigned short port, int nrservs)
|
|||
error = nfsd_racache_init(2*nrservs);
|
||||
if (error<0)
|
||||
goto out;
|
||||
error = nfs4_state_init();
|
||||
error = nfs4_state_start();
|
||||
if (error<0)
|
||||
goto out;
|
||||
if (!nfsd_serv) {
|
||||
|
|
|
@ -145,12 +145,12 @@ int nfsd_set_posix_acl(struct svc_fh *, int, struct posix_acl *);
|
|||
* NFSv4 State
|
||||
*/
|
||||
#ifdef CONFIG_NFSD_V4
|
||||
int nfs4_state_init(void);
|
||||
int nfs4_state_start(void);
|
||||
void nfs4_state_shutdown(void);
|
||||
time_t nfs4_lease_time(void);
|
||||
void nfs4_reset_lease(time_t leasetime);
|
||||
#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 time_t nfs4_lease_time(void){return 0;}
|
||||
static inline void nfs4_reset_lease(time_t leasetime){}
|
||||
|
|
Loading…
Reference in New Issue