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 07/15] LockD: manage grace period per network namespace
Date: Wed, 25 Jul 2012 16:56:43 +0400 [thread overview]
Message-ID: <20120725125643.24376.68151.stgit@localhost.localdomain> (raw)
In-Reply-To: <20120725125258.24376.82525.stgit@localhost.localdomain>
Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com>
---
fs/lockd/netns.h | 2 ++
fs/lockd/svc.c | 17 +++++++++++------
2 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/fs/lockd/netns.h b/fs/lockd/netns.h
index 44c8f0b..94653ae 100644
--- a/fs/lockd/netns.h
+++ b/fs/lockd/netns.h
@@ -7,6 +7,8 @@ struct lockd_net {
unsigned int nlmsvc_users;
unsigned long next_gc;
unsigned long nrhosts;
+
+ struct delayed_work grace_period_end;
};
extern int lockd_net_id;
diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c
index 80938fd..70c4177 100644
--- a/fs/lockd/svc.c
+++ b/fs/lockd/svc.c
@@ -95,21 +95,22 @@ static void grace_ender(struct work_struct *not_used)
locks_end_grace(&lockd_manager);
}
-static DECLARE_DELAYED_WORK(grace_period_end, grace_ender);
-
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);
- cancel_delayed_work_sync(&grace_period_end);
- schedule_delayed_work(&grace_period_end, grace_period);
+ cancel_delayed_work_sync(&ln->grace_period_end);
+ schedule_delayed_work(&ln->grace_period_end, grace_period);
}
static void restart_grace(void)
{
if (nlmsvc_ops) {
- cancel_delayed_work_sync(&grace_period_end);
+ struct lockd_net *ln = net_generic(&init_net, lockd_net_id);
+
+ cancel_delayed_work_sync(&ln->grace_period_end);
locks_end_grace(&lockd_manager);
nlmsvc_invalidate_all();
set_grace_period();
@@ -124,6 +125,7 @@ lockd(void *vrqstp)
{
int err = 0, preverr = 0;
struct svc_rqst *rqstp = vrqstp;
+ struct lockd_net *ln = net_generic(&init_net, lockd_net_id);
/* try_to_freeze() is called from svc_recv() */
set_freezable();
@@ -184,7 +186,7 @@ lockd(void *vrqstp)
svc_process(rqstp);
}
flush_signals(current);
- cancel_delayed_work_sync(&grace_period_end);
+ cancel_delayed_work_sync(&ln->grace_period_end);
locks_end_grace(&lockd_manager);
if (nlmsvc_ops)
nlmsvc_invalidate_all();
@@ -589,6 +591,9 @@ module_param(nlm_max_connections, uint, 0644);
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);
return 0;
}
next prev 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 ` Stanislav Kinsbursky [this message]
2012-07-25 12:56 ` [PATCH v2 08/15] LockD: make lockd manager allocated per network namespace 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 ` [PATCH v2 11/15] LockD: manage grace list per network namespace Stanislav Kinsbursky
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=20120725125643.24376.68151.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).