diff options
author | Yafang Shao <laoar.shao@gmail.com> | 2017-12-20 11:12:52 +0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-12-20 14:00:25 -0500 |
commit | 986ffdfd08dbaae721e82720e6bfc2c307e732dd (patch) | |
tree | 0aa6bd09827ff4654e2b3f563cb0059945fd6194 /include/net/sock.h | |
parent | 563e0bb0dc74b3ca888e24f8c08f0239fe4016b0 (diff) | |
download | linux-986ffdfd08dbaae721e82720e6bfc2c307e732dd.tar.gz linux-986ffdfd08dbaae721e82720e6bfc2c307e732dd.tar.bz2 linux-986ffdfd08dbaae721e82720e6bfc2c307e732dd.zip |
net: sock: replace sk_state_load with inet_sk_state_load and remove sk_state_store
sk_state_load is only used by AF_INET/AF_INET6, so rename it to
inet_sk_state_load and move it into inet_sock.h.
sk_state_store is removed as it is not used any more.
Signed-off-by: Yafang Shao <laoar.shao@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/sock.h')
-rw-r--r-- | include/net/sock.h | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index 0a32f3ce381c..6c1db823f8b9 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -2333,31 +2333,6 @@ static inline bool sk_listener(const struct sock *sk) return (1 << sk->sk_state) & (TCPF_LISTEN | TCPF_NEW_SYN_RECV); } -/** - * sk_state_load - read sk->sk_state for lockless contexts - * @sk: socket pointer - * - * Paired with sk_state_store(). Used in places we do not hold socket lock : - * tcp_diag_get_info(), tcp_get_info(), tcp_poll(), get_tcp4_sock() ... - */ -static inline int sk_state_load(const struct sock *sk) -{ - return smp_load_acquire(&sk->sk_state); -} - -/** - * sk_state_store - update sk->sk_state - * @sk: socket pointer - * @newstate: new state - * - * Paired with sk_state_load(). Should be used in contexts where - * state change might impact lockless readers. - */ -static inline void sk_state_store(struct sock *sk, int newstate) -{ - smp_store_release(&sk->sk_state, newstate); -} - void sock_enable_timestamp(struct sock *sk, int flag); int sock_get_timestamp(struct sock *, struct timeval __user *); int sock_get_timestampns(struct sock *, struct timespec __user *); |