2 files changed, 12 insertions, 8 deletions

diff --git a/fs/lockd/netns.h b/fs/lockd/netns.h
index 94653aecfffb..e78650cb937c 100644
--- a/fs/lockd/netns.h
+++ b/fs/lockd/netns.h
@@ -1,6 +1,7 @@
 #ifndef __LOCKD_NETNS_H__
 #define __LOCKD_NETNS_H__
 
+#include <linux/fs.h>
 #include <net/netns/generic.h>
 
 struct lockd_net {
@@ -9,6 +10,7 @@ struct lockd_net {
         unsigned long nrhosts;
 
         struct delayed_work grace_period_end;
+        struct lock_manager lockd_manager;
 };
 
 extern int lockd_net_id;
diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c
index 70c417758eb9..a9c436bc450c 100644
--- a/fs/lockd/svc.c
+++ b/fs/lockd/svc.c
@@ -87,12 +87,14 @@ static unsigned long get_lockd_grace_period(void)
                 return nlm_timeout * 5 * HZ;
 }
 
-static struct lock_manager lockd_manager = {
-};
-
-static void grace_ender(struct work_struct *not_used)
+static void grace_ender(struct work_struct *grace)
 {
-        locks_end_grace(&lockd_manager);
+        struct delayed_work *dwork = container_of(grace, struct delayed_work,
+                                                  work);
+        struct lockd_net *ln = container_of(dwork, struct lockd_net,
+                                            grace_period_end);
+
+        locks_end_grace(&ln->lockd_manager);
 }
 
 static void set_grace_period(void)
@@ -100,7 +102,7 @@ static void set_grace_period(void)
         unsigned long grace_period = get_lockd_grace_period();
         struct lockd_net *ln = net_generic(&init_net, lockd_net_id);
 
-        locks_start_grace(&lockd_manager);
+        locks_start_grace(&ln->lockd_manager);
         cancel_delayed_work_sync(&ln->grace_period_end);
         schedule_delayed_work(&ln->grace_period_end, grace_period);
 }
@@ -111,7 +113,7 @@ static void restart_grace(void)
                 struct lockd_net *ln = net_generic(&init_net, lockd_net_id);
 
                 cancel_delayed_work_sync(&ln->grace_period_end);
-                locks_end_grace(&lockd_manager);
+                locks_end_grace(&ln->lockd_manager);
                 nlmsvc_invalidate_all();
                 set_grace_period();
         }
@@ -187,7 +189,7 @@ lockd(void *vrqstp)
         }
         flush_signals(current);
         cancel_delayed_work_sync(&ln->grace_period_end);
-        locks_end_grace(&lockd_manager);
+        locks_end_grace(&ln->lockd_manager);
         if (nlmsvc_ops)
                 nlmsvc_invalidate_all();
         nlm_shutdown_hosts();