evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

LockD: make lockd manager allocated per network namespace

Browse source 
Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
Stanislav Kinsbursky 2012-07-25 16:56:50 +04:00 • committed by J. Bruce Fields
parent 66547b0251
commit 08d44a35a9
2 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fs/lockd/netns.h
View file

@ -1,6 +1,7 @@
#ifndef __LOCKD_NETNS_H__ #ifndef __LOCKD_NETNS_H__
#define __LOCKD_NETNS_H__ #define __LOCKD_NETNS_H__
#include <linux/fs.h>
#include <net/netns/generic.h> #include <net/netns/generic.h>
struct lockd_net { struct lockd_net {
@ -9,6 +10,7 @@ struct lockd_net {
unsigned long nrhosts; unsigned long nrhosts;
struct delayed_work grace_period_end; struct delayed_work grace_period_end;
struct lock_manager lockd_manager;
}; };
extern int lockd_net_id; extern int lockd_net_id;

18
fs/lockd/svc.c
View file

@ -87,12 +87,14 @@ static unsigned long get_lockd_grace_period(void)
return nlm_timeout * 5 * HZ; return nlm_timeout * 5 * HZ;
} }
static struct lock_manager lockd_manager = { static void grace_ender(struct work_struct *grace)
};
static void grace_ender(struct work_struct *not_used)
{ {
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) static void set_grace_period(void)
@ -100,7 +102,7 @@ static void set_grace_period(void)
unsigned long grace_period = get_lockd_grace_period(); 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(&init_net, lockd_net_id);
locks_start_grace(&lockd_manager); locks_start_grace(&ln->lockd_manager);
cancel_delayed_work_sync(&ln->grace_period_end); cancel_delayed_work_sync(&ln->grace_period_end);
schedule_delayed_work(&ln->grace_period_end, grace_period); 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); struct lockd_net *ln = net_generic(&init_net, lockd_net_id);
cancel_delayed_work_sync(&ln->grace_period_end); cancel_delayed_work_sync(&ln->grace_period_end);
locks_end_grace(&lockd_manager); locks_end_grace(&ln->lockd_manager);
nlmsvc_invalidate_all(); nlmsvc_invalidate_all();
set_grace_period(); set_grace_period();
} }
@ -187,7 +189,7 @@ lockd(void *vrqstp)
} }
flush_signals(current); flush_signals(current);
cancel_delayed_work_sync(&ln->grace_period_end); cancel_delayed_work_sync(&ln->grace_period_end);
locks_end_grace(&lockd_manager); locks_end_grace(&ln->lockd_manager);
if (nlmsvc_ops) if (nlmsvc_ops)
nlmsvc_invalidate_all(); nlmsvc_invalidate_all();
nlm_shutdown_hosts(); nlm_shutdown_hosts();