diff options
Diffstat (limited to 'net/unix/af_unix.c')
-rw-r--r-- | net/unix/af_unix.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index 3d9122e78f41..87c0360eaa25 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c | |||
@@ -316,7 +316,7 @@ static void unix_write_space(struct sock *sk) | |||
316 | read_lock(&sk->sk_callback_lock); | 316 | read_lock(&sk->sk_callback_lock); |
317 | if (unix_writable(sk)) { | 317 | if (unix_writable(sk)) { |
318 | if (sk_has_sleeper(sk)) | 318 | if (sk_has_sleeper(sk)) |
319 | wake_up_interruptible_sync(sk->sk_sleep); | 319 | wake_up_interruptible_sync(sk_sleep(sk)); |
320 | sk_wake_async(sk, SOCK_WAKE_SPACE, POLL_OUT); | 320 | sk_wake_async(sk, SOCK_WAKE_SPACE, POLL_OUT); |
321 | } | 321 | } |
322 | read_unlock(&sk->sk_callback_lock); | 322 | read_unlock(&sk->sk_callback_lock); |
@@ -1736,7 +1736,7 @@ static long unix_stream_data_wait(struct sock *sk, long timeo) | |||
1736 | unix_state_lock(sk); | 1736 | unix_state_lock(sk); |
1737 | 1737 | ||
1738 | for (;;) { | 1738 | for (;;) { |
1739 | prepare_to_wait(sk->sk_sleep, &wait, TASK_INTERRUPTIBLE); | 1739 | prepare_to_wait(sk_sleep(sk), &wait, TASK_INTERRUPTIBLE); |
1740 | 1740 | ||
1741 | if (!skb_queue_empty(&sk->sk_receive_queue) || | 1741 | if (!skb_queue_empty(&sk->sk_receive_queue) || |
1742 | sk->sk_err || | 1742 | sk->sk_err || |
@@ -1752,7 +1752,7 @@ static long unix_stream_data_wait(struct sock *sk, long timeo) | |||
1752 | clear_bit(SOCK_ASYNC_WAITDATA, &sk->sk_socket->flags); | 1752 | clear_bit(SOCK_ASYNC_WAITDATA, &sk->sk_socket->flags); |
1753 | } | 1753 | } |
1754 | 1754 | ||
1755 | finish_wait(sk->sk_sleep, &wait); | 1755 | finish_wait(sk_sleep(sk), &wait); |
1756 | unix_state_unlock(sk); | 1756 | unix_state_unlock(sk); |
1757 | return timeo; | 1757 | return timeo; |
1758 | } | 1758 | } |
@@ -1991,7 +1991,7 @@ static unsigned int unix_poll(struct file *file, struct socket *sock, poll_table | |||
1991 | struct sock *sk = sock->sk; | 1991 | struct sock *sk = sock->sk; |
1992 | unsigned int mask; | 1992 | unsigned int mask; |
1993 | 1993 | ||
1994 | sock_poll_wait(file, sk->sk_sleep, wait); | 1994 | sock_poll_wait(file, sk_sleep(sk), wait); |
1995 | mask = 0; | 1995 | mask = 0; |
1996 | 1996 | ||
1997 | /* exceptional events? */ | 1997 | /* exceptional events? */ |
@@ -2028,7 +2028,7 @@ static unsigned int unix_dgram_poll(struct file *file, struct socket *sock, | |||
2028 | struct sock *sk = sock->sk, *other; | 2028 | struct sock *sk = sock->sk, *other; |
2029 | unsigned int mask, writable; | 2029 | unsigned int mask, writable; |
2030 | 2030 | ||
2031 | sock_poll_wait(file, sk->sk_sleep, wait); | 2031 | sock_poll_wait(file, sk_sleep(sk), wait); |
2032 | mask = 0; | 2032 | mask = 0; |
2033 | 2033 | ||
2034 | /* exceptional events? */ | 2034 | /* exceptional events? */ |