Commit 6867137e authored by Dai Ngo's avatar Dai Ngo Committed by Chuck Lever

NFSD: refactoring v4 specific code to a helper in nfs4state.c

This patch moves the v4 specific code from nfsd_init_net() to
nfsd4_init_leases_net() helper in nfs4state.c
Signed-off-by: default avatarDai Ngo <dai.ngo@oracle.com>
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
parent 427f5f83
...@@ -4330,6 +4330,18 @@ nfsd4_init_slabs(void) ...@@ -4330,6 +4330,18 @@ nfsd4_init_slabs(void)
return -ENOMEM; return -ENOMEM;
} }
void nfsd4_init_leases_net(struct nfsd_net *nn)
{
nn->nfsd4_lease = 90; /* default lease time */
nn->nfsd4_grace = 90;
nn->somebody_reclaimed = false;
nn->track_reclaim_completes = false;
nn->clverifier_counter = prandom_u32();
nn->clientid_base = prandom_u32();
nn->clientid_counter = nn->clientid_base + 1;
nn->s2s_cp_cl_id = nn->clientid_counter++;
}
static void init_nfs4_replay(struct nfs4_replay *rp) static void init_nfs4_replay(struct nfs4_replay *rp)
{ {
rp->rp_status = nfserr_serverfault; rp->rp_status = nfserr_serverfault;
......
...@@ -1484,14 +1484,7 @@ static __net_init int nfsd_init_net(struct net *net) ...@@ -1484,14 +1484,7 @@ static __net_init int nfsd_init_net(struct net *net)
retval = nfsd_reply_cache_init(nn); retval = nfsd_reply_cache_init(nn);
if (retval) if (retval)
goto out_drc_error; goto out_drc_error;
nn->nfsd4_lease = 90; /* default lease time */ nfsd4_init_leases_net(nn);
nn->nfsd4_grace = 90;
nn->somebody_reclaimed = false;
nn->track_reclaim_completes = false;
nn->clverifier_counter = prandom_u32();
nn->clientid_base = prandom_u32();
nn->clientid_counter = nn->clientid_base + 1;
nn->s2s_cp_cl_id = nn->clientid_counter++;
get_random_bytes(&nn->siphash_key, sizeof(nn->siphash_key)); get_random_bytes(&nn->siphash_key, sizeof(nn->siphash_key));
seqlock_init(&nn->writeverf_lock); seqlock_init(&nn->writeverf_lock);
......
...@@ -496,12 +496,16 @@ extern void unregister_cld_notifier(void); ...@@ -496,12 +496,16 @@ extern void unregister_cld_notifier(void);
extern void nfsd4_ssc_init_umount_work(struct nfsd_net *nn); extern void nfsd4_ssc_init_umount_work(struct nfsd_net *nn);
#endif #endif
extern void nfsd4_init_leases_net(struct nfsd_net *nn);
#else /* CONFIG_NFSD_V4 */ #else /* CONFIG_NFSD_V4 */
static inline int nfsd4_is_junction(struct dentry *dentry) static inline int nfsd4_is_junction(struct dentry *dentry)
{ {
return 0; return 0;
} }
static inline void nfsd4_init_leases_net(struct nfsd_net *nn) {};
#define register_cld_notifier() 0 #define register_cld_notifier() 0
#define unregister_cld_notifier() do { } while(0) #define unregister_cld_notifier() do { } while(0)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment