diff options
author | Hannes Frederic Sowa <hannes@stressinduktion.org> | 2016-04-05 15:10:15 (GMT) |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-04-07 20:44:14 (GMT) |
commit | 1e1d04e678cf72442f57ce82803c7a407769135f (patch) | |
tree | 8ea1054b59c4abe211ffff0b81f34589b0089f22 /net/ipv4/af_inet.c | |
parent | 61881cfb5ad80c1d0a46ca6d08b7e271892b2ff6 (diff) | |
download | linux-1e1d04e678cf72442f57ce82803c7a407769135f.tar.xz |
net: introduce lockdep_is_held and update various places to use it
The socket is either locked if we hold the slock spin_lock for
lock_sock_fast and unlock_sock_fast or we own the lock (sk_lock.owned
!= 0). Check for this and at the same time improve that the current
thread/cpu is really holding the lock.
Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/af_inet.c')
-rw-r--r-- | net/ipv4/af_inet.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c index a38b991..8217cd2 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c @@ -1107,7 +1107,7 @@ static int inet_sk_reselect_saddr(struct sock *sk) struct ip_options_rcu *inet_opt; inet_opt = rcu_dereference_protected(inet->inet_opt, - sock_owned_by_user(sk)); + lockdep_sock_is_held(sk)); if (inet_opt && inet_opt->opt.srr) daddr = inet_opt->opt.faddr; |