1 files changed, 11 insertions, 3 deletions

diff --git a/fs/lockd/grace.c b/fs/lockd/grace.c
index 183cc1f0af1..8dbaff78209 100644
--- a/fs/lockd/grace.c
+++ b/fs/lockd/grace.c
@@ -4,8 +4,10 @@
 
 #include <linux/module.h>
 #include <linux/lockd/bind.h>
+#include <net/net_namespace.h>
+
+#include "netns.h"
 
-static LIST_HEAD(grace_list);
 static DEFINE_SPINLOCK(grace_lock);
 
 /**
@@ -21,8 +23,11 @@ static DEFINE_SPINLOCK(grace_lock);
  */
 void locks_start_grace(struct lock_manager *lm)
 {
+        struct net *net = &init_net;
+        struct lockd_net *ln = net_generic(net, lockd_net_id);
+
         spin_lock(&grace_lock);
-        list_add(&lm->list, &grace_list);
+        list_add(&lm->list, &ln->grace_list);
         spin_unlock(&grace_lock);
 }
 EXPORT_SYMBOL_GPL(locks_start_grace);
@@ -54,6 +59,9 @@ EXPORT_SYMBOL_GPL(locks_end_grace);
  */
 int locks_in_grace(void)
 {
-        return !list_empty(&grace_list);
+        struct net *net = &init_net;
+        struct lockd_net *ln = net_generic(net, lockd_net_id);
+
+        return !list_empty(&ln->grace_list);
 }
 EXPORT_SYMBOL_GPL(locks_in_grace);