Commit 1c87733d authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

net_ns: add __rcu annotations 



add __rcu annotation to (struct net)->gen, and use
rcu_dereference_protected() in net_assign_generic()

Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6e3f7faf

include/net/net_namespace.h

+1 −1
Original line number Diff line number Diff line
@@ -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

net/core/net_namespace.c

+3 −1
Original line number Diff line number Diff line
@@ -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;