openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ipv4: remove flush_mutex from ipv4_sysctl_rtcache_flush 

It is possible to avoid locking at all in ipv4_sysctl_rtcache_flush by
defining local ctl_table on the stack.

The patch is based on the suggestion from Eric W. Biederman.

Signed-off-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Denis V. Lunev 2008-07-08 03:05:28 -07:00 committed by David S. Miller
parent 2c693610fe
commit 81c684d12d
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
net/ipv4/route.c
View File

@ -2873,22 +2873,20 @@ void ip_rt_multicast_event(struct in_device *in_dev)
} }
#ifdef CONFIG_SYSCTL #ifdef CONFIG_SYSCTL
static int ipv4_sysctl_rtcache_flush(ctl_table *ctl, int write, static int ipv4_sysctl_rtcache_flush(ctl_table *__ctl, int write,
struct file *filp, void __user *buffer, struct file *filp, void __user *buffer,
size_t *lenp, loff_t *ppos) size_t *lenp, loff_t *ppos)
{ {
if (write) { if (write) {
int flush_delay; int flush_delay;
ctl_table ctl;
struct net *net; struct net *net;
static DEFINE_MUTEX(flush_mutex);
mutex_lock(&flush_mutex); memcpy(&ctl, __ctl, sizeof(ctl));
ctl->data = &flush_delay; ctl.data = &flush_delay;
proc_dointvec(ctl, write, filp, buffer, lenp, ppos); proc_dointvec(&ctl, write, filp, buffer, lenp, ppos);
ctl->data = NULL;
mutex_unlock(&flush_mutex);
net = (struct net *)ctl->extra1; net = (struct net *)__ctl->extra1;
rt_cache_flush(net, flush_delay); rt_cache_flush(net, flush_delay);
return 0; return 0;
} }