diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2010-10-25 03:02:02 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-10-25 14:18:27 -0700 |
| commit | 6e3f7faf3e8a3e226b1a6b955aac12abf2f2e1b6 (patch) | |
| tree | a2ff2fe9f86ff561d62ceac56e8fe18d7b6f14a0 /net/core/sysctl_net_core.c | |
| parent | f6318e558806c925029dc101f14874be9f9fa78f (diff) | |
| download | olio-linux-3.10-6e3f7faf3e8a3e226b1a6b955aac12abf2f2e1b6.tar.xz olio-linux-3.10-6e3f7faf3e8a3e226b1a6b955aac12abf2f2e1b6.zip | |
rps: add __rcu annotations
Add __rcu annotations to :
(struct netdev_rx_queue)->rps_map
(struct netdev_rx_queue)->rps_flow_table
struct rps_sock_flow_table *rps_sock_flow_table;
And use appropriate rcu primitives.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/sysctl_net_core.c')
| -rw-r--r-- | net/core/sysctl_net_core.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c index 01eee5d984b..385b6095fdc 100644 --- a/net/core/sysctl_net_core.c +++ b/net/core/sysctl_net_core.c @@ -34,7 +34,8 @@ static int rps_sock_flow_sysctl(ctl_table *table, int write, mutex_lock(&sock_flow_mutex); - orig_sock_table = rps_sock_flow_table; + orig_sock_table = rcu_dereference_protected(rps_sock_flow_table, + lockdep_is_held(&sock_flow_mutex)); size = orig_size = orig_sock_table ? orig_sock_table->mask + 1 : 0; ret = proc_dointvec(&tmp, write, buffer, lenp, ppos); |