Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-13 00:20:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

inet: remove rcu protection on tw_net

Browse Source 
commit b099ce2602d806 (net: Batch inet_twsk_purge) added rcu protection
on tw_net for no obvious reason.

struct net are refcounted anyway since timewait sockets escape from rcu
protected sections. tw_net stay valid for the whole timwait lifetime.

This also removes a lot of sparse errors.

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
CC: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eric Dumazet 2011-12-14 04:58:33 +00:00 committed by David S. Miller
parent e6560d4dfe
commit f943cbe6fb
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/net/inet_timewait_sock.h
View File

@ -218,20 +218,12 @@ extern void inet_twsk_purge(struct inet_hashinfo *hashinfo,
static inline static inline
struct net *twsk_net(const struct inet_timewait_sock *twsk) struct net *twsk_net(const struct inet_timewait_sock *twsk)
{ {
#ifdef CONFIG_NET_NS return read_pnet(&twsk->tw_net);
return rcu_dereference_raw(twsk->tw_net); /* protected by locking, */
/* reference counting, */
/* initialization, or RCU. */
#else
return &init_net;
#endif
} }
static inline static inline
void twsk_net_set(struct inet_timewait_sock *twsk, struct net *net) void twsk_net_set(struct inet_timewait_sock *twsk, struct net *net)
{ {
#ifdef CONFIG_NET_NS write_pnet(&twsk->tw_net, net);
rcu_assign_pointer(twsk->tw_net, net);
#endif
} }
#endif /* _INET_TIMEWAIT_SOCK_ */ #endif /* _INET_TIMEWAIT_SOCK_ */