From 6546b81b59faa5c4deaf2293098e1e50bdb01916 Mon Sep 17 00:00:00 2001 From: Stanislav Kinsbursky Date: Wed, 25 Jul 2012 16:57:37 +0400 Subject: [PATCH] --- yaml --- r: 320419 b: refs/heads/master c: a51c84ed502c25fed996afb7696fd7db2fa32fe2 h: refs/heads/master i: 320417: 5e4d9b362712f7c845876b3f72aa70f5d2218752 320415: e812e24ff80781320ba0bea0558d365057aa48ac v: v3 --- [refs] | 2 +- trunk/fs/nfsd/netns.h | 1 + trunk/fs/nfsd/nfs4state.c | 8 +++----- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index e3001420ccff..9efa991ffa50 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5630f7fa97e8dfa2b3c6e7370c1702180336e493 +refs/heads/master: a51c84ed502c25fed996afb7696fd7db2fa32fe2 diff --git a/trunk/fs/nfsd/netns.h b/trunk/fs/nfsd/netns.h index e99767d987c8..b6deebd08ef2 100644 --- a/trunk/fs/nfsd/netns.h +++ b/trunk/fs/nfsd/netns.h @@ -36,6 +36,7 @@ struct nfsd_net { struct cache_detail *nametoid_cache; struct lock_manager nfsd4_manager; + bool grace_ended; }; extern int nfsd_net_id; diff --git a/trunk/fs/nfsd/nfs4state.c b/trunk/fs/nfsd/nfs4state.c index 34f65f10fa43..aebb58d3ac4a 100644 --- a/trunk/fs/nfsd/nfs4state.c +++ b/trunk/fs/nfsd/nfs4state.c @@ -3119,19 +3119,17 @@ nfsd4_renew(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, return status; } -static bool grace_ended; - static void nfsd4_end_grace(struct net *net) { struct nfsd_net *nn = net_generic(net, nfsd_net_id); /* do nothing if grace period already ended */ - if (grace_ended) + if (nn->grace_ended) return; dprintk("NFSD: end of grace period\n"); - grace_ended = true; + nn->grace_ended = true; nfsd4_record_grace_done(net, boot_time); locks_end_grace(&nn->nfsd4_manager); /* @@ -4705,7 +4703,7 @@ nfs4_state_start(void) nfsd4_client_tracking_init(net); boot_time = get_seconds(); locks_start_grace(net, &nn->nfsd4_manager); - grace_ended = false; + nn->grace_ended = false; printk(KERN_INFO "NFSD: starting %ld-second grace period\n", nfsd4_grace); ret = set_callback_cred();