From 80b646538f0bf799bf658e38174def7743d21818 Mon Sep 17 00:00:00 2001 From: Stanislav Kinsbursky Date: Wed, 25 Jul 2012 16:56:50 +0400 Subject: [PATCH] --- yaml --- r: 320413 b: refs/heads/master c: 08d44a35a9e71a132c8e8abb0451b7b5e5b3dfee h: refs/heads/master i: 320411: 67d0c44d8c2322c22de185ae78c6eca8f08ed1ee v: v3 --- [refs] | 2 +- trunk/fs/lockd/netns.h | 2 ++ trunk/fs/lockd/svc.c | 18 ++++++++++-------- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 61602d762e6c..0d804b412cb8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 66547b0251b0b62dcb637631f566410a0e1e47a8 +refs/heads/master: 08d44a35a9e71a132c8e8abb0451b7b5e5b3dfee diff --git a/trunk/fs/lockd/netns.h b/trunk/fs/lockd/netns.h index 94653aecfffb..e78650cb937c 100644 --- a/trunk/fs/lockd/netns.h +++ b/trunk/fs/lockd/netns.h @@ -1,6 +1,7 @@ #ifndef __LOCKD_NETNS_H__ #define __LOCKD_NETNS_H__ +#include #include 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/trunk/fs/lockd/svc.c b/trunk/fs/lockd/svc.c index 70c417758eb9..a9c436bc450c 100644 --- a/trunk/fs/lockd/svc.c +++ b/trunk/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();