net: sk_sleep() helper

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / net / iucv / af_iucv.c

diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
index c18286a2167b9987f15dd0f765d1ed8e2aa1625b..9636b7d27b48fa8131cf6eaf32d7a3fa79f55a9a 100644 (file)
--- a/net/iucv/af_iucv.c
+++ b/net/iucv/af_iucv.c
@@ -59,7 +59,7 @@ do {                                                                  \
        DEFINE_WAIT(__wait);                                            \
        long __timeo = timeo;                                           \
        ret = 0;                                                        \
-       prepare_to_wait(sk->sk_sleep, &__wait, TASK_INTERRUPTIBLE);     \
+       prepare_to_wait(sk_sleep(sk), &__wait, TASK_INTERRUPTIBLE);     \
        while (!(condition)) {                                          \
                if (!__timeo) {                                         \
                        ret = -EAGAIN;                                  \
@@ -76,7 +76,7 @@ do {                                                                  \
                if (ret)                                                \
                        break;                                          \
        }                                                               \
-       finish_wait(sk->sk_sleep, &__wait);                             \
+       finish_wait(sk_sleep(sk), &__wait);                             \
 } while (0)
 
 #define iucv_sock_wait(sk, condition, timeo)                           \
@@ -307,7 +307,7 @@ static void iucv_sock_wake_msglim(struct sock *sk)
 {
        read_lock(&sk->sk_callback_lock);
        if (sk_has_sleeper(sk))
-               wake_up_interruptible_all(sk->sk_sleep);
+               wake_up_interruptible_all(sk_sleep(sk));
        sk_wake_async(sk, SOCK_WAKE_SPACE, POLL_OUT);
        read_unlock(&sk->sk_callback_lock);
 }
@@ -795,7 +795,7 @@ static int iucv_sock_accept(struct socket *sock, struct socket *newsock,
        timeo = sock_rcvtimeo(sk, flags & O_NONBLOCK);
 
        /* Wait for an incoming connection */
-       add_wait_queue_exclusive(sk->sk_sleep, &wait);
+       add_wait_queue_exclusive(sk_sleep(sk), &wait);
        while (!(nsk = iucv_accept_dequeue(sk, newsock))) {
                set_current_state(TASK_INTERRUPTIBLE);
                if (!timeo) {
@@ -819,7 +819,7 @@ static int iucv_sock_accept(struct socket *sock, struct socket *newsock,
        }
 
        set_current_state(TASK_RUNNING);
-       remove_wait_queue(sk->sk_sleep, &wait);
+       remove_wait_queue(sk_sleep(sk), &wait);
 
        if (err)
                goto done;
@@ -1269,7 +1269,7 @@ unsigned int iucv_sock_poll(struct file *file, struct socket *sock,
        struct sock *sk = sock->sk;
        unsigned int mask = 0;
 
-       sock_poll_wait(file, sk->sk_sleep, wait);
+       sock_poll_wait(file, sk_sleep(sk), wait);
 
        if (sk->sk_state == IUCV_LISTEN)
                return iucv_accept_poll(sk);