Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9fa1959e authored by Kinglong Mee's avatar Kinglong Mee Committed by J. Bruce Fields
Browse files

NFSD: Get rid of empty function nfs4_state_init 



Signed-off-by: default avatarKinglong Mee <kinglongmee@gmail.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent f3e41ec5

fs/nfsd/nfs4state.c

+0 −7
Original line number Diff line number Diff line
@@ -4979,13 +4979,6 @@ struct nfs4_client *nfsd_find_client(struct sockaddr_storage *addr, size_t addr_ 


#endif /* CONFIG_NFSD_FAULT_INJECTION */



/* initialization to perform at module load time: */



void

nfs4_state_init(void)

{

}



/*

 * Since the lifetime of a delegation isn't limited to that of an open, a

 * client may quite reasonably hang on to a delegation as long as it has

fs/nfsd/nfsctl.c

+0 −1
Original line number Diff line number Diff line
@@ -1179,7 +1179,6 @@ static int __init init_nfsd(void) 
	retval = nfsd4_init_slabs();

	if (retval)

		goto out_unregister_pernet;

	nfs4_state_init();

	retval = nfsd_fault_inject_init(); /* nfsd fault injection controls */

	if (retval)

		goto out_free_slabs;

fs/nfsd/nfsd.h

+0 −2
Original line number Diff line number Diff line
@@ -115,7 +115,6 @@ static inline int nfsd_v4client(struct svc_rqst *rq) 
 */

#ifdef CONFIG_NFSD_V4

extern unsigned long max_delegations;

void nfs4_state_init(void);

int nfsd4_init_slabs(void);

void nfsd4_free_slabs(void);

int nfs4_state_start(void);
@@ -126,7 +125,6 @@ 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; }

static inline void nfsd4_free_slabs(void) { }

static inline int nfs4_state_start(void) { return 0; }