Skip to content

Commit

Permalink
net: use sk_sleep()
Browse files Browse the repository at this point in the history 
Commit aa39514 (net: sk_sleep() helper) missed three files in the
conversion.

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Eric Dumazet authored and David S. Miller committed Apr 26, 2010
1 parent be9e969 commit 4a4771a
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 21 deletions.
6 changes: 3 additions & 3 deletions drivers/net/macvtap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ static int macvtap_forward(struct net_device *dev, struct sk_buff *skb)
return -ENOLINK;

skb_queue_tail(&q->sk.sk_receive_queue, skb);
wake_up_interruptible_poll(q->sk.sk_sleep, POLLIN | POLLRDNORM | POLLRDBAND);
wake_up_interruptible_poll(sk_sleep(&q->sk), POLLIN | POLLRDNORM | POLLRDBAND);
return 0;
}

Expand Down Expand Up @@ -562,7 +562,7 @@ static ssize_t macvtap_do_read(struct macvtap_queue *q, struct kiocb *iocb,
struct sk_buff *skb;
ssize_t ret = 0;

add_wait_queue(q->sk.sk_sleep, &wait);
add_wait_queue(sk_sleep(&q->sk), &wait);
while (len) {
current->state = TASK_INTERRUPTIBLE;

Expand All @@ -587,7 +587,7 @@ static ssize_t macvtap_do_read(struct macvtap_queue *q, struct kiocb *iocb,
}

current->state = TASK_RUNNING;
remove_wait_queue(q->sk.sk_sleep, &wait);
remove_wait_queue(sk_sleep(&q->sk), &wait);
return ret;
}

Expand Down
30 changes: 15 additions & 15 deletions net/caif/caif_socket.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ static int caif_sktrecv_cb(struct cflayer *layr, struct cfpkt *pkt)

/* Signal reader that data is available. */

wake_up_interruptible(cf_sk->sk.sk_sleep);
wake_up_interruptible(sk_sleep(&cf_sk->sk));

return 0;
}
Expand Down Expand Up @@ -203,7 +203,7 @@ static void caif_sktflowctrl_cb(struct cflayer *layr,
dbfs_atomic_inc(&cnt.num_tx_flow_on_ind);
/* Signal reader that data is available. */
SET_TX_FLOW_ON(cf_sk);
wake_up_interruptible(cf_sk->sk.sk_sleep);
wake_up_interruptible(sk_sleep(&cf_sk->sk));
break;

case CAIF_CTRLCMD_FLOW_OFF_IND:
Expand All @@ -217,16 +217,16 @@ static void caif_sktflowctrl_cb(struct cflayer *layr,
caif_assert(STATE_IS_OPEN(cf_sk));
SET_PENDING_OFF(cf_sk);
SET_TX_FLOW_ON(cf_sk);
wake_up_interruptible(cf_sk->sk.sk_sleep);
wake_up_interruptible(sk_sleep(&cf_sk->sk));
break;

case CAIF_CTRLCMD_DEINIT_RSP:
dbfs_atomic_inc(&cnt.num_deinit_resp);
caif_assert(!STATE_IS_OPEN(cf_sk));
SET_PENDING_OFF(cf_sk);
if (!STATE_IS_PENDING_DESTROY(cf_sk)) {
if (cf_sk->sk.sk_sleep != NULL)
wake_up_interruptible(cf_sk->sk.sk_sleep);
if (sk_sleep(&cf_sk->sk) != NULL)
wake_up_interruptible(sk_sleep(&cf_sk->sk));
}
dbfs_atomic_inc(&cnt.num_deinit);
sock_put(&cf_sk->sk);
Expand All @@ -238,7 +238,7 @@ static void caif_sktflowctrl_cb(struct cflayer *layr,
SET_STATE_CLOSED(cf_sk);
SET_PENDING_OFF(cf_sk);
SET_TX_FLOW_OFF(cf_sk);
wake_up_interruptible(cf_sk->sk.sk_sleep);
wake_up_interruptible(sk_sleep(&cf_sk->sk));
break;

case CAIF_CTRLCMD_REMOTE_SHUTDOWN_IND:
Expand All @@ -247,7 +247,7 @@ static void caif_sktflowctrl_cb(struct cflayer *layr,
/* Use sk_shutdown to indicate remote shutdown indication */
cf_sk->sk.sk_shutdown |= RCV_SHUTDOWN;
cf_sk->file_mode = 0;
wake_up_interruptible(cf_sk->sk.sk_sleep);
wake_up_interruptible(sk_sleep(&cf_sk->sk));
break;

default:
Expand Down Expand Up @@ -325,7 +325,7 @@ static int caif_recvmsg(struct kiocb *iocb, struct socket *sock,
release_sock(&cf_sk->sk);

result =
wait_event_interruptible(*cf_sk->sk.sk_sleep,
wait_event_interruptible(*sk_sleep(&cf_sk->sk),
!STATE_IS_PENDING(cf_sk));

lock_sock(&(cf_sk->sk));
Expand Down Expand Up @@ -365,7 +365,7 @@ static int caif_recvmsg(struct kiocb *iocb, struct socket *sock,
release_sock(&cf_sk->sk);

/* Block reader until data arrives or socket is closed. */
if (wait_event_interruptible(*cf_sk->sk.sk_sleep,
if (wait_event_interruptible(*sk_sleep(&cf_sk->sk),
cfpkt_qpeek(cf_sk->pktq)
|| STATE_IS_REMOTE_SHUTDOWN(cf_sk)
|| !STATE_IS_OPEN(cf_sk)) ==
Expand Down Expand Up @@ -537,7 +537,7 @@ static int caif_sendmsg(struct kiocb *kiocb, struct socket *sock,
* for its conclusion.
*/
result =
wait_event_interruptible(*cf_sk->sk.sk_sleep,
wait_event_interruptible(*sk_sleep(&cf_sk->sk),
!STATE_IS_PENDING(cf_sk));
/* I want to be alone on cf_sk (except status and queue) */
lock_sock(&(cf_sk->sk));
Expand Down Expand Up @@ -573,7 +573,7 @@ static int caif_sendmsg(struct kiocb *kiocb, struct socket *sock,
release_sock(&cf_sk->sk);

/* Wait until flow is on or socket is closed */
if (wait_event_interruptible(*cf_sk->sk.sk_sleep,
if (wait_event_interruptible(*sk_sleep(&cf_sk->sk),
TX_FLOW_IS_ON(cf_sk)
|| !STATE_IS_OPEN(cf_sk)
|| STATE_IS_REMOTE_SHUTDOWN(cf_sk)
Expand Down Expand Up @@ -650,7 +650,7 @@ static int caif_sendmsg(struct kiocb *kiocb, struct socket *sock,
release_sock(&cf_sk->sk);

/* Wait until flow is on or socket is closed */
if (wait_event_interruptible(*cf_sk->sk.sk_sleep,
if (wait_event_interruptible(*sk_sleep(&cf_sk->sk),
TX_FLOW_IS_ON(cf_sk)
|| !STATE_IS_OPEN(cf_sk)
|| STATE_IS_REMOTE_SHUTDOWN(cf_sk)
Expand Down Expand Up @@ -898,7 +898,7 @@ static int caif_connect(struct socket *sock, struct sockaddr *uservaddr,
* for its conclusion.
*/
result =
wait_event_interruptible(*cf_sk->sk.sk_sleep,
wait_event_interruptible(*sk_sleep(&cf_sk->sk),
!STATE_IS_PENDING(cf_sk));

lock_sock(&(cf_sk->sk));
Expand Down Expand Up @@ -965,7 +965,7 @@ static int caif_connect(struct socket *sock, struct sockaddr *uservaddr,
release_sock(&cf_sk->sk);

result =
wait_event_interruptible(*cf_sk->sk.sk_sleep,
wait_event_interruptible(*sk_sleep(&cf_sk->sk),
!STATE_IS_PENDING(cf_sk));

lock_sock(&(cf_sk->sk));
Expand Down Expand Up @@ -1107,7 +1107,7 @@ static int caif_release(struct socket *sock)
* CAIF stack.
*/
if (!(sock->file->f_flags & O_NONBLOCK)) {
res = wait_event_interruptible(*cf_sk->sk.sk_sleep,
res = wait_event_interruptible(*sk_sleep(&cf_sk->sk),
!STATE_IS_PENDING(cf_sk));

if (res == -ERESTARTSYS) {
Expand Down
6 changes: 3 additions & 3 deletions net/rxrpc/ar-recvmsg.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ int rxrpc_recvmsg(struct kiocb *iocb, struct socket *sock,

/* wait for a message to turn up */
release_sock(&rx->sk);
prepare_to_wait_exclusive(rx->sk.sk_sleep, &wait,
prepare_to_wait_exclusive(sk_sleep(&rx->sk), &wait,
TASK_INTERRUPTIBLE);
ret = sock_error(&rx->sk);
if (ret)
Expand All @@ -102,7 +102,7 @@ int rxrpc_recvmsg(struct kiocb *iocb, struct socket *sock,
goto wait_interrupted;
timeo = schedule_timeout(timeo);
}
finish_wait(rx->sk.sk_sleep, &wait);
finish_wait(sk_sleep(&rx->sk), &wait);
lock_sock(&rx->sk);
continue;
}
Expand Down Expand Up @@ -356,7 +356,7 @@ int rxrpc_recvmsg(struct kiocb *iocb, struct socket *sock,
wait_interrupted:
ret = sock_intr_errno(timeo);
wait_error:
finish_wait(rx->sk.sk_sleep, &wait);
finish_wait(sk_sleep(&rx->sk), &wait);
if (continue_call)
rxrpc_put_call(continue_call);
if (copied)
Expand Down

0 comments on commit 4a4771a

Please sign in to comment.