LockD: pass actual network namespace to grace period management functions

Passed network namespace replaced hard-coded init_net

Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>

5 files changed, 35 insertions, 31 deletions

diff --git a/fs/lockd/grace.c b/fs/lockd/grace.c
index 8dbaff782098..6d1ee7204c88 100644
--- a/fs/lockd/grace.c
+++ b/fs/lockd/grace.c
@@ -21,9 +21,8 @@ static DEFINE_SPINLOCK(grace_lock);
  *
  * This function is called to start a grace period.
  */
-void locks_start_grace(struct lock_manager *lm)
+void locks_start_grace(struct net *net, struct lock_manager *lm)
 {
-        struct net *net = &init_net;
         struct lockd_net *ln = net_generic(net, lockd_net_id);
 
         spin_lock(&grace_lock);
@@ -57,9 +56,8 @@ EXPORT_SYMBOL_GPL(locks_end_grace);
  * to answer ordinary lock requests, and when they should accept only
  * lock reclaims.
  */
-int locks_in_grace(void)
+int locks_in_grace(struct net *net)
 {
-        struct net *net = &init_net;
         struct lockd_net *ln = net_generic(net, lockd_net_id);
 
         return !list_empty(&ln->grace_list);
diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c
index 834dfe2ed2e9..68271c206bdc 100644
--- a/fs/lockd/svc.c
+++ b/fs/lockd/svc.c
@@ -97,12 +97,12 @@ static void grace_ender(struct work_struct *grace)
         locks_end_grace(&ln->lockd_manager);
 }
 
-static void set_grace_period(void)
+static void set_grace_period(struct net *net)
 {
         unsigned long grace_period = get_lockd_grace_period();
-        struct lockd_net *ln = net_generic(&init_net, lockd_net_id);
+        struct lockd_net *ln = net_generic(net, lockd_net_id);
 
-        locks_start_grace(&ln->lockd_manager);
+        locks_start_grace(net, &ln->lockd_manager);
         cancel_delayed_work_sync(&ln->grace_period_end);
         schedule_delayed_work(&ln->grace_period_end, grace_period);
 }
@@ -110,12 +110,13 @@ static void set_grace_period(void)
 static void restart_grace(void)
 {
         if (nlmsvc_ops) {
-                struct lockd_net *ln = net_generic(&init_net, lockd_net_id);
+                struct net *net = &init_net;
+                struct lockd_net *ln = net_generic(net, lockd_net_id);
 
                 cancel_delayed_work_sync(&ln->grace_period_end);
                 locks_end_grace(&ln->lockd_manager);
                 nlmsvc_invalidate_all();
-                set_grace_period();
+                set_grace_period(net);
         }
 }
 
@@ -127,7 +128,8 @@ lockd(void *vrqstp)
 {
         int             err = 0, preverr = 0;
         struct svc_rqst *rqstp = vrqstp;
-        struct lockd_net *ln = net_generic(&init_net, lockd_net_id);
+        struct net *net = &init_net;
+        struct lockd_net *ln = net_generic(net, lockd_net_id);
 
         /* try_to_freeze() is called from svc_recv() */
         set_freezable();
@@ -141,7 +143,7 @@ lockd(void *vrqstp)
                 nlm_timeout = LOCKD_DFLT_TIMEO;
         nlmsvc_timeout = nlm_timeout * HZ;
 
-        set_grace_period();
+        set_grace_period(net);
 
         /*
          * The main request loop. We don't terminate until the last
diff --git a/fs/lockd/svc4proc.c b/fs/lockd/svc4proc.c
index 9a41fdc19511..4a43d253c045 100644
--- a/fs/lockd/svc4proc.c
+++ b/fs/lockd/svc4proc.c
@@ -11,6 +11,7 @@
 #include <linux/time.h>
 #include <linux/lockd/lockd.h>
 #include <linux/lockd/share.h>
+#include <linux/sunrpc/svc_xprt.h>
 
 #define NLMDBG_FACILITY         NLMDBG_CLIENT
 
@@ -151,7 +152,7 @@ nlm4svc_proc_cancel(struct svc_rqst *rqstp, struct nlm_args *argp,
         resp->cookie = argp->cookie;
 
         /* Don't accept requests during grace period */
-        if (locks_in_grace()) {
+        if (locks_in_grace(SVC_NET(rqstp))) {
                 resp->status = nlm_lck_denied_grace_period;
                 return rpc_success;
         }
@@ -161,7 +162,7 @@ nlm4svc_proc_cancel(struct svc_rqst *rqstp, struct nlm_args *argp,
                 return resp->status == nlm_drop_reply ? rpc_drop_reply :rpc_success;
 
         /* Try to cancel request. */
-        resp->status = nlmsvc_cancel_blocked(file, &argp->lock);
+        resp->status = nlmsvc_cancel_blocked(SVC_NET(rqstp), file, &argp->lock);
 
         dprintk("lockd: CANCEL        status %d\n", ntohl(resp->status));
         nlmsvc_release_host(host);
@@ -184,7 +185,7 @@ nlm4svc_proc_unlock(struct svc_rqst *rqstp, struct nlm_args *argp,
         resp->cookie = argp->cookie;
 
         /* Don't accept new lock requests during grace period */
-        if (locks_in_grace()) {
+        if (locks_in_grace(SVC_NET(rqstp))) {
                 resp->status = nlm_lck_denied_grace_period;
                 return rpc_success;
         }
@@ -194,7 +195,7 @@ nlm4svc_proc_unlock(struct svc_rqst *rqstp, struct nlm_args *argp,
                 return resp->status == nlm_drop_reply ? rpc_drop_reply :rpc_success;
 
         /* Now try to remove the lock */
-        resp->status = nlmsvc_unlock(file, &argp->lock);
+        resp->status = nlmsvc_unlock(SVC_NET(rqstp), file, &argp->lock);
 
         dprintk("lockd: UNLOCK        status %d\n", ntohl(resp->status));
         nlmsvc_release_host(host);
@@ -321,7 +322,7 @@ nlm4svc_proc_share(struct svc_rqst *rqstp, struct nlm_args *argp,
         resp->cookie = argp->cookie;
 
         /* Don't accept new lock requests during grace period */
-        if (locks_in_grace() && !argp->reclaim) {
+        if (locks_in_grace(SVC_NET(rqstp)) && !argp->reclaim) {
                 resp->status = nlm_lck_denied_grace_period;
                 return rpc_success;
         }
@@ -354,7 +355,7 @@ nlm4svc_proc_unshare(struct svc_rqst *rqstp, struct nlm_args *argp,
         resp->cookie = argp->cookie;
 
         /* Don't accept requests during grace period */
-        if (locks_in_grace()) {
+        if (locks_in_grace(SVC_NET(rqstp))) {
                 resp->status = nlm_lck_denied_grace_period;
                 return rpc_success;
         }
diff --git a/fs/lockd/svclock.c b/fs/lockd/svclock.c
index e46353f41a42..afe4488c33d8 100644
--- a/fs/lockd/svclock.c
+++ b/fs/lockd/svclock.c
@@ -26,7 +26,7 @@
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/sunrpc/clnt.h>
-#include <linux/sunrpc/svc.h>
+#include <linux/sunrpc/svc_xprt.h>
 #include <linux/lockd/nlm.h>
 #include <linux/lockd/lockd.h>
 #include <linux/kthread.h>
@@ -447,11 +447,11 @@ nlmsvc_lock(struct svc_rqst *rqstp, struct nlm_file *file,
                 goto out;
         }
 
-        if (locks_in_grace() && !reclaim) {
+        if (locks_in_grace(SVC_NET(rqstp)) && !reclaim) {
                 ret = nlm_lck_denied_grace_period;
                 goto out;
         }
-        if (reclaim && !locks_in_grace()) {
+        if (reclaim && !locks_in_grace(SVC_NET(rqstp))) {
                 ret = nlm_lck_denied_grace_period;
                 goto out;
         }
@@ -559,7 +559,7 @@ nlmsvc_testlock(struct svc_rqst *rqstp, struct nlm_file *file,
                 goto out;
         }
 
-        if (locks_in_grace()) {
+        if (locks_in_grace(SVC_NET(rqstp))) {
                 ret = nlm_lck_denied_grace_period;
                 goto out;
         }
@@ -603,7 +603,7 @@ out:
  * must be removed.
  */
 __be32
-nlmsvc_unlock(struct nlm_file *file, struct nlm_lock *lock)
+nlmsvc_unlock(struct net *net, struct nlm_file *file, struct nlm_lock *lock)
 {
         int     error;
 
@@ -615,7 +615,7 @@ nlmsvc_unlock(struct nlm_file *file, struct nlm_lock *lock)
                                 (long long)lock->fl.fl_end);
 
         /* First, cancel any lock that might be there */
-        nlmsvc_cancel_blocked(file, lock);
+        nlmsvc_cancel_blocked(net, file, lock);
 
         lock->fl.fl_type = F_UNLCK;
         error = vfs_lock_file(file->f_file, F_SETLK, &lock->fl, NULL);
@@ -631,7 +631,7 @@ nlmsvc_unlock(struct nlm_file *file, struct nlm_lock *lock)
  * The calling procedure must check whether the file can be closed.
  */
 __be32
-nlmsvc_cancel_blocked(struct nlm_file *file, struct nlm_lock *lock)
+nlmsvc_cancel_blocked(struct net *net, struct nlm_file *file, struct nlm_lock *lock)
 {
         struct nlm_block        *block;
         int status = 0;
@@ -643,7 +643,7 @@ nlmsvc_cancel_blocked(struct nlm_file *file, struct nlm_lock *lock)
                                 (long long)lock->fl.fl_start,
                                 (long long)lock->fl.fl_end);
 
-        if (locks_in_grace())
+        if (locks_in_grace(net))
                 return nlm_lck_denied_grace_period;
 
         mutex_lock(&file->f_mutex);
diff --git a/fs/lockd/svcproc.c b/fs/lockd/svcproc.c
index d27aab11f324..de8f2caa2235 100644
--- a/fs/lockd/svcproc.c
+++ b/fs/lockd/svcproc.c
@@ -11,6 +11,7 @@
 #include <linux/time.h>
 #include <linux/lockd/lockd.h>
 #include <linux/lockd/share.h>
+#include <linux/sunrpc/svc_xprt.h>
 
 #define NLMDBG_FACILITY         NLMDBG_CLIENT
 
@@ -175,13 +176,14 @@ nlmsvc_proc_cancel(struct svc_rqst *rqstp, struct nlm_args *argp,
 {
         struct nlm_host *host;
         struct nlm_file *file;
+        struct net *net = SVC_NET(rqstp);
 
         dprintk("lockd: CANCEL        called\n");
 
         resp->cookie = argp->cookie;
 
         /* Don't accept requests during grace period */
-        if (locks_in_grace()) {
+        if (locks_in_grace(net)) {
                 resp->status = nlm_lck_denied_grace_period;
                 return rpc_success;
         }
@@ -191,7 +193,7 @@ nlmsvc_proc_cancel(struct svc_rqst *rqstp, struct nlm_args *argp,
                 return resp->status == nlm_drop_reply ? rpc_drop_reply :rpc_success;
 
         /* Try to cancel request. */
-        resp->status = cast_status(nlmsvc_cancel_blocked(file, &argp->lock));
+        resp->status = cast_status(nlmsvc_cancel_blocked(net, file, &argp->lock));
 
         dprintk("lockd: CANCEL        status %d\n", ntohl(resp->status));
         nlmsvc_release_host(host);
@@ -208,13 +210,14 @@ nlmsvc_proc_unlock(struct svc_rqst *rqstp, struct nlm_args *argp,
 {
         struct nlm_host *host;
         struct nlm_file *file;
+        struct net *net = SVC_NET(rqstp);
 
         dprintk("lockd: UNLOCK        called\n");
 
         resp->cookie = argp->cookie;
 
         /* Don't accept new lock requests during grace period */
-        if (locks_in_grace()) {
+        if (locks_in_grace(net)) {
                 resp->status = nlm_lck_denied_grace_period;
                 return rpc_success;
         }
@@ -224,7 +227,7 @@ nlmsvc_proc_unlock(struct svc_rqst *rqstp, struct nlm_args *argp,
                 return resp->status == nlm_drop_reply ? rpc_drop_reply :rpc_success;
 
         /* Now try to remove the lock */
-        resp->status = cast_status(nlmsvc_unlock(file, &argp->lock));
+        resp->status = cast_status(nlmsvc_unlock(net, file, &argp->lock));
 
         dprintk("lockd: UNLOCK        status %d\n", ntohl(resp->status));
         nlmsvc_release_host(host);
@@ -361,7 +364,7 @@ nlmsvc_proc_share(struct svc_rqst *rqstp, struct nlm_args *argp,
         resp->cookie = argp->cookie;
 
         /* Don't accept new lock requests during grace period */
-        if (locks_in_grace() && !argp->reclaim) {
+        if (locks_in_grace(SVC_NET(rqstp)) && !argp->reclaim) {
                 resp->status = nlm_lck_denied_grace_period;
                 return rpc_success;
         }
@@ -394,7 +397,7 @@ nlmsvc_proc_unshare(struct svc_rqst *rqstp, struct nlm_args *argp,
         resp->cookie = argp->cookie;
 
         /* Don't accept requests during grace period */
-        if (locks_in_grace()) {
+        if (locks_in_grace(SVC_NET(rqstp))) {
                 resp->status = nlm_lck_denied_grace_period;
                 return rpc_success;
         }