aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfsd/nfs4state.c
diff options
context:
space:
mode:
authorStanislav Kinsbursky <skinsbursky@parallels.com>2012-11-14 10:22:12 -0500
committerJ. Bruce Fields <bfields@redhat.com>2012-11-15 07:40:50 -0500
commit12760c6685624d65f8de078485c21b6a08e83409 (patch)
tree827bdc4ae8e65968a72b018719c1658f49f06b61 /fs/nfsd/nfs4state.c
parent3320fef19b542b8df9606bd8e63990dc2a3fb330 (diff)
nfsd: pass nfsd_net instead of net to grace enders
Passing net context looks as overkill. Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd/nfs4state.c')
-rw-r--r--fs/nfsd/nfs4state.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 996a8a58944d..2e4ed691255a 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -3157,17 +3157,15 @@ out:
3157} 3157}
3158 3158
3159static void 3159static void
3160nfsd4_end_grace(struct net *net) 3160nfsd4_end_grace(struct nfsd_net *nn)
3161{ 3161{
3162 struct nfsd_net *nn = net_generic(net, nfsd_net_id);
3163
3164 /* do nothing if grace period already ended */ 3162 /* do nothing if grace period already ended */
3165 if (nn->grace_ended) 3163 if (nn->grace_ended)
3166 return; 3164 return;
3167 3165
3168 dprintk("NFSD: end of grace period\n"); 3166 dprintk("NFSD: end of grace period\n");
3169 nn->grace_ended = true; 3167 nn->grace_ended = true;
3170 nfsd4_record_grace_done(net, nn->boot_time); 3168 nfsd4_record_grace_done(nn, nn->boot_time);
3171 locks_end_grace(&nn->nfsd4_manager); 3169 locks_end_grace(&nn->nfsd4_manager);
3172 /* 3170 /*
3173 * Now that every NFSv4 client has had the chance to recover and 3171 * Now that every NFSv4 client has had the chance to recover and
@@ -3192,7 +3190,7 @@ nfs4_laundromat(void)
3192 nfs4_lock_state(); 3190 nfs4_lock_state();
3193 3191
3194 dprintk("NFSD: laundromat service - starting\n"); 3192 dprintk("NFSD: laundromat service - starting\n");
3195 nfsd4_end_grace(&init_net); 3193 nfsd4_end_grace(nn);
3196 INIT_LIST_HEAD(&reaplist); 3194 INIT_LIST_HEAD(&reaplist);
3197 spin_lock(&client_lock); 3195 spin_lock(&client_lock);
3198 list_for_each_safe(pos, next, &nn->client_lru) { 3196 list_for_each_safe(pos, next, &nn->client_lru) {