2 files changed, 9 insertions, 4 deletions

diff --git a/fs/nfs_common/grace.c b/fs/nfs_common/grace.c
index bd3e2d328e64..5be08f02a76b 100644
--- a/fs/nfs_common/grace.c
+++ b/fs/nfs_common/grace.c
@@ -30,7 +30,11 @@ locks_start_grace(struct net *net, struct lock_manager *lm)
         struct list_head *grace_list = net_generic(net, grace_net_id);
 
         spin_lock(&grace_lock);
-        list_add(&lm->list, grace_list);
+        if (list_empty(&lm->list))
+                list_add(&lm->list, grace_list);
+        else
+                WARN(1, "double list_add attempt detected in net %x %s\n",
+                     net->ns.inum, (net == &init_net) ? "(init_net)" : "");
         spin_unlock(&grace_lock);
 }
 EXPORT_SYMBOL_GPL(locks_start_grace);
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 73451436c1c2..b29b5a185a2c 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -7103,6 +7103,10 @@ static int nfs4_state_create_net(struct net *net)
                 INIT_LIST_HEAD(&nn->sessionid_hashtbl[i]);
         nn->conf_name_tree = RB_ROOT;
         nn->unconf_name_tree = RB_ROOT;
+        nn->boot_time = get_seconds();
+        nn->grace_ended = false;
+        nn->nfsd4_manager.block_opens = true;
+        INIT_LIST_HEAD(&nn->nfsd4_manager.list);
         INIT_LIST_HEAD(&nn->client_lru);
         INIT_LIST_HEAD(&nn->close_lru);
         INIT_LIST_HEAD(&nn->del_recall_lru);
@@ -7160,9 +7164,6 @@ nfs4_state_start_net(struct net *net)
         ret = nfs4_state_create_net(net);
         if (ret)
                 return ret;
-        nn->boot_time = get_seconds();
-        nn->grace_ended = false;
-        nn->nfsd4_manager.block_opens = true;
         locks_start_grace(net, &nn->nfsd4_manager);
         nfsd4_client_tracking_init(net);
         printk(KERN_INFO "NFSD: starting %ld-second grace period (net %x)\n",