diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/core/sock.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/core/sock.c b/net/core/sock.c index 190de61cd648..beb924c248e8 100644 --- a/net/core/sock.c +++ b/net/core/sock.c | |||
@@ -1585,9 +1585,9 @@ void fastcall lock_sock_nested(struct sock *sk, int subclass) | |||
1585 | { | 1585 | { |
1586 | might_sleep(); | 1586 | might_sleep(); |
1587 | spin_lock_bh(&sk->sk_lock.slock); | 1587 | spin_lock_bh(&sk->sk_lock.slock); |
1588 | if (sk->sk_lock.owner) | 1588 | if (sk->sk_lock.owned) |
1589 | __lock_sock(sk); | 1589 | __lock_sock(sk); |
1590 | sk->sk_lock.owner = (void *)1; | 1590 | sk->sk_lock.owned = 1; |
1591 | spin_unlock(&sk->sk_lock.slock); | 1591 | spin_unlock(&sk->sk_lock.slock); |
1592 | /* | 1592 | /* |
1593 | * The sk_lock has mutex_lock() semantics here: | 1593 | * The sk_lock has mutex_lock() semantics here: |
@@ -1608,7 +1608,7 @@ void fastcall release_sock(struct sock *sk) | |||
1608 | spin_lock_bh(&sk->sk_lock.slock); | 1608 | spin_lock_bh(&sk->sk_lock.slock); |
1609 | if (sk->sk_backlog.tail) | 1609 | if (sk->sk_backlog.tail) |
1610 | __release_sock(sk); | 1610 | __release_sock(sk); |
1611 | sk->sk_lock.owner = NULL; | 1611 | sk->sk_lock.owned = 0; |
1612 | if (waitqueue_active(&sk->sk_lock.wq)) | 1612 | if (waitqueue_active(&sk->sk_lock.wq)) |
1613 | wake_up(&sk->sk_lock.wq); | 1613 | wake_up(&sk->sk_lock.wq); |
1614 | spin_unlock_bh(&sk->sk_lock.slock); | 1614 | spin_unlock_bh(&sk->sk_lock.slock); |