From 11eb80bf279aeaf36f08c34ca6a76077b88b0592 Mon Sep 17 00:00:00 2001 From: "Denis V. Lunev" Date: Tue, 8 Jul 2008 03:05:28 -0700 Subject: [PATCH] --- yaml --- r: 103333 b: refs/heads/master c: 81c684d12ddc05bba4953e36e9cdd5939dde344b h: refs/heads/master i: 103331: 2f5b223e67eb667857d96ecab032c1e8be466c56 v: v3 --- [refs] | 2 +- trunk/net/ipv4/route.c | 14 ++++++-------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index d22181d78ab9..b3dd2beb9a4d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2c693610fe923764fe41b846fb86938a2010da6e +refs/heads/master: 81c684d12ddc05bba4953e36e9cdd5939dde344b diff --git a/trunk/net/ipv4/route.c b/trunk/net/ipv4/route.c index 113cd2512ba7..79c1e74263a1 100644 --- a/trunk/net/ipv4/route.c +++ b/trunk/net/ipv4/route.c @@ -2873,22 +2873,20 @@ void ip_rt_multicast_event(struct in_device *in_dev) } #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, size_t *lenp, loff_t *ppos) { if (write) { int flush_delay; + ctl_table ctl; struct net *net; - static DEFINE_MUTEX(flush_mutex); - mutex_lock(&flush_mutex); - ctl->data = &flush_delay; - proc_dointvec(ctl, write, filp, buffer, lenp, ppos); - ctl->data = NULL; - mutex_unlock(&flush_mutex); + memcpy(&ctl, __ctl, sizeof(ctl)); + ctl.data = &flush_delay; + proc_dointvec(&ctl, write, filp, buffer, lenp, ppos); - net = (struct net *)ctl->extra1; + net = (struct net *)__ctl->extra1; rt_cache_flush(net, flush_delay); return 0; }