OpenVZ Forum: Devel » [PATCH v2 00/15] Lockd: grace period containerization

Home » Mailing lists » Devel » [PATCH v2 00/15] Lockd: grace period containerization

Show: Today's Messages :: Show Polls :: Message Navigator
E-mail to friend

[PATCH v2 07/15] LockD: manage grace period per network namespace [message #47243 is a reply to message #47241]

Wed, 25 July 2012 12:56

Stanislav Kinsbursky is currently offline

Stanislav Kinsbursky
Messages: 683
Registered: October 2011

Senior Member

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;
}

Report message to a moderator

[Message index]

		[PATCH v2 00/15] Lockd: grace period containerization By: Stanislav Kinsbursky on Wed, 25 July 2012 12:55
		[PATCH v2 01/15] LockD: mark host per network namespace on garbage collect By: Stanislav Kinsbursky on Wed, 25 July 2012 12:55
		[PATCH v2 07/15] LockD: manage grace period per network namespace By: Stanislav Kinsbursky on Wed, 25 July 2012 12:56
		[PATCH v2 10/15] SUNRPC: service request network namespace helper introduced By: Stanislav Kinsbursky on Wed, 25 July 2012 12:57
		[PATCH v2 11/15] LockD: manage grace list per network namespace By: Stanislav Kinsbursky on Wed, 25 July 2012 12:57
		[PATCH v2 02/15] LockD: make garbage collector network namespace aware. By: Stanislav Kinsbursky on Wed, 25 July 2012 12:56
		[PATCH v2 06/15] Lockd: add more debug to host shutdown functions By: Stanislav Kinsbursky on Wed, 25 July 2012 12:56
		[PATCH v2 03/15] LockD: manage garbage collection timeout per networks namespace By: Stanislav Kinsbursky on Wed, 25 July 2012 12:56
		[PATCH v2 05/15] Lockd: host complaining function introduced By: Stanislav Kinsbursky on Wed, 25 July 2012 12:56
		[PATCH v2 04/15] LockD: manage used host count per networks namespace By: Stanislav Kinsbursky on Wed, 25 July 2012 12:56
		[PATCH v2 08/15] LockD: make lockd manager allocated per network namespace By: Stanislav Kinsbursky on Wed, 25 July 2012 12:56
		[PATCH v2 14/15] NFSd: make grace end flag per network namespace By: Stanislav Kinsbursky on Wed, 25 July 2012 12:57
		[PATCH v2 09/15] NFSd: make nfsd4_manager allocated per network namespace context. By: Stanislav Kinsbursky on Wed, 25 July 2012 12:56
		Re: [PATCH v2 09/15] NFSd: make nfsd4_manager allocated per network namespace context. By: bfields on Fri, 27 July 2012 21:46
		[PATCH v2 15/15] NFSd: make boot_time variable per network namespace By: Stanislav Kinsbursky on Wed, 25 July 2012 12:57
		[PATCH v2 13/15] Lockd: move grace period management from lockd() to per-net functions By: Stanislav Kinsbursky on Wed, 25 July 2012 12:57
		[PATCH v2 12/15] LockD: pass actual network namespace to grace period management functions By: Stanislav Kinsbursky on Wed, 25 July 2012 12:57
		Re: [PATCH v2 00/15] Lockd: grace period containerization By: bfields on Fri, 27 July 2012 21:54
		Re: [PATCH v2 00/15] Lockd: grace period containerization By: Stanislav Kinsbursky on Mon, 30 July 2012 10:03
		Re: [PATCH v2 00/15] Lockd: grace period containerization By: bfields on Tue, 31 July 2012 14:19
		Re: [PATCH v2 00/15] Lockd: grace period containerization By: Stanislav Kinsbursky on Tue, 31 July 2012 14:26

Previous Topic:	SUNRPC lients: Pipefs mount races
Next Topic:	[PATCH 00/10] memcg kmem limitation - slab.

Goto Forum:

-=] Back to Top [=-

[ Syndicate this forum (XML) ] [

] [

]

Current Time: Wed Jul 23 01:44:12 GMT 2025

Total time taken to generate the page: 0.12064 seconds