Skip to content
This repository has been archived by the owner on Aug 27, 2022. It is now read-only.

Commit

Permalink
ipv4: remove flush_mutex from ipv4_sysctl_rtcache_flush
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
dlunev authored and davem330 committed Jul 8, 2008
1 parent 2c69361 commit 81c684d
Showing 1 changed file with 6 additions and 8 deletions.
14 changes: 6 additions & 8 deletions net/ipv4/route.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit 81c684d

Please sign in to comment.