linux-nfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stanislav Kinsbursky <skinsbursky@parallels.com>
To: bfields@fieldses.org
Cc: linux-nfs@vger.kernel.org, Trond.Myklebust@netapp.com,
	linux-kernel@vger.kernel.org, devel@openvz.org
Subject: [PATCH v2 11/15] LockD: manage grace list per network namespace
Date: Wed, 25 Jul 2012 16:57:13 +0400	[thread overview]
Message-ID: <20120725125713.24376.40630.stgit@localhost.localdomain> (raw)
In-Reply-To: <20120725125258.24376.82525.stgit@localhost.localdomain>

Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com>
---
 fs/lockd/grace.c |   14 +++++++++++---
 fs/lockd/netns.h |    1 +
 fs/lockd/svc.c   |    1 +
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/fs/lockd/grace.c b/fs/lockd/grace.c
index 183cc1f..8dbaff7 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);
diff --git a/fs/lockd/netns.h b/fs/lockd/netns.h
index e78650c..4eee248 100644
--- a/fs/lockd/netns.h
+++ b/fs/lockd/netns.h
@@ -11,6 +11,7 @@ struct lockd_net {
 
 	struct delayed_work grace_period_end;
 	struct lock_manager lockd_manager;
+	struct list_head grace_list;
 };
 
 extern int lockd_net_id;
diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c
index a9c436b..834dfe2 100644
--- a/fs/lockd/svc.c
+++ b/fs/lockd/svc.c
@@ -596,6 +596,7 @@ static int lockd_init_net(struct net *net)
 	struct lockd_net *ln = net_generic(net, lockd_net_id);
 
 	INIT_DELAYED_WORK(&ln->grace_period_end, grace_ender);
+	INIT_LIST_HEAD(&ln->grace_list);
 	return 0;
 }
 


  parent reply	other threads:[~2012-07-25 12:58 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-07-25 12:55 [PATCH v2 00/15] Lockd: grace period containerization Stanislav Kinsbursky
2012-07-25 12:55 ` [PATCH v2 01/15] LockD: mark host per network namespace on garbage collect Stanislav Kinsbursky
2012-07-25 12:56 ` [PATCH v2 02/15] LockD: make garbage collector network namespace aware Stanislav Kinsbursky
2012-07-25 12:56 ` [PATCH v2 03/15] LockD: manage garbage collection timeout per networks namespace Stanislav Kinsbursky
2012-07-25 12:56 ` [PATCH v2 04/15] LockD: manage used host count " Stanislav Kinsbursky
2012-07-25 12:56 ` [PATCH v2 05/15] Lockd: host complaining function introduced Stanislav Kinsbursky
2012-07-25 12:56 ` [PATCH v2 06/15] Lockd: add more debug to host shutdown functions Stanislav Kinsbursky
2012-07-25 12:56 ` [PATCH v2 07/15] LockD: manage grace period per network namespace Stanislav Kinsbursky
2012-07-25 12:56 ` [PATCH v2 08/15] LockD: make lockd manager allocated " Stanislav Kinsbursky
2012-07-25 12:56 ` [PATCH v2 09/15] NFSd: make nfsd4_manager allocated per network namespace context Stanislav Kinsbursky
2012-07-27 21:46   ` J. Bruce Fields
2012-07-25 12:57 ` [PATCH v2 10/15] SUNRPC: service request network namespace helper introduced Stanislav Kinsbursky
2012-07-25 12:57 ` Stanislav Kinsbursky [this message]
2012-07-25 12:57 ` [PATCH v2 12/15] LockD: pass actual network namespace to grace period management functions Stanislav Kinsbursky
2012-07-25 12:57 ` [PATCH v2 13/15] Lockd: move grace period management from lockd() to per-net functions Stanislav Kinsbursky
2012-07-25 12:57 ` [PATCH v2 14/15] NFSd: make grace end flag per network namespace Stanislav Kinsbursky
2012-07-25 12:57 ` [PATCH v2 15/15] NFSd: make boot_time variable " Stanislav Kinsbursky
2012-07-27 21:54 ` [PATCH v2 00/15] Lockd: grace period containerization J. Bruce Fields
2012-07-30 10:03   ` Stanislav Kinsbursky
2012-07-31 14:19     ` J. Bruce Fields
2012-07-31 14:26       ` Stanislav Kinsbursky

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20120725125713.24376.40630.stgit@localhost.localdomain \
    --to=skinsbursky@parallels.com \
    --cc=Trond.Myklebust@netapp.com \
    --cc=bfields@fieldses.org \
    --cc=devel@openvz.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-nfs@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).