diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2010-10-25 03:20:11 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-10-25 14:18:27 -0700 |
| commit | 1c87733d0682547050ccccb400cdac425fa43b39 (patch) | |
| tree | 8ec9de7722a2be0e97d9ad6a04d12fb0d298b201 | |
| parent | 6e3f7faf3e8a3e226b1a6b955aac12abf2f2e1b6 (diff) | |
| download | op-kernel-dev-1c87733d0682547050ccccb400cdac425fa43b39.zip op-kernel-dev-1c87733d0682547050ccccb400cdac425fa43b39.tar.gz | |
net_ns: add __rcu annotations
add __rcu annotation to (struct net)->gen, and use
rcu_dereference_protected() in net_assign_generic()
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/net/net_namespace.h | 2 | ||||
| -rw-r--r-- | net/core/net_namespace.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h index 65af9a0..1bf812b 100644 --- a/include/net/net_namespace.h +++ b/include/net/net_namespace.h @@ -88,7 +88,7 @@ struct net { #ifdef CONFIG_WEXT_CORE struct sk_buff_head wext_nlevents; #endif - struct net_generic *gen; + struct net_generic __rcu *gen; /* Note : following structs are cache line aligned */ #ifdef CONFIG_XFRM diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c index c988e68..3f86026 100644 --- a/net/core/net_namespace.c +++ b/net/core/net_namespace.c @@ -42,7 +42,9 @@ static int net_assign_generic(struct net *net, int id, void *data) BUG_ON(!mutex_is_locked(&net_mutex)); BUG_ON(id == 0); - ng = old_ng = net->gen; + old_ng = rcu_dereference_protected(net->gen, + lockdep_is_held(&net_mutex)); + ng = old_ng; if (old_ng->len >= id) goto assign; |
