net: use sk_sleep()
Commit aa395145
(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>
This commit is contained in:
parent
be9e969d79
commit
4a4771a58e
|
@ -181,7 +181,7 @@ static int macvtap_forward(struct net_device *dev, struct sk_buff *skb)
|
||||||
return -ENOLINK;
|
return -ENOLINK;
|
||||||
|
|
||||||
skb_queue_tail(&q->sk.sk_receive_queue, skb);
|
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;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -562,7 +562,7 @@ static ssize_t macvtap_do_read(struct macvtap_queue *q, struct kiocb *iocb,
|
||||||
struct sk_buff *skb;
|
struct sk_buff *skb;
|
||||||
ssize_t ret = 0;
|
ssize_t ret = 0;
|
||||||
|
|
||||||
add_wait_queue(q->sk.sk_sleep, &wait);
|
add_wait_queue(sk_sleep(&q->sk), &wait);
|
||||||
while (len) {
|
while (len) {
|
||||||
current->state = TASK_INTERRUPTIBLE;
|
current->state = TASK_INTERRUPTIBLE;
|
||||||
|
|
||||||
|
@ -587,7 +587,7 @@ static ssize_t macvtap_do_read(struct macvtap_queue *q, struct kiocb *iocb,
|
||||||
}
|
}
|
||||||
|
|
||||||
current->state = TASK_RUNNING;
|
current->state = TASK_RUNNING;
|
||||||
remove_wait_queue(q->sk.sk_sleep, &wait);
|
remove_wait_queue(sk_sleep(&q->sk), &wait);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -169,7 +169,7 @@ static int caif_sktrecv_cb(struct cflayer *layr, struct cfpkt *pkt)
|
||||||
|
|
||||||
/* Signal reader that data is available. */
|
/* Signal reader that data is available. */
|
||||||
|
|
||||||
wake_up_interruptible(cf_sk->sk.sk_sleep);
|
wake_up_interruptible(sk_sleep(&cf_sk->sk));
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -203,7 +203,7 @@ static void caif_sktflowctrl_cb(struct cflayer *layr,
|
||||||
dbfs_atomic_inc(&cnt.num_tx_flow_on_ind);
|
dbfs_atomic_inc(&cnt.num_tx_flow_on_ind);
|
||||||
/* Signal reader that data is available. */
|
/* Signal reader that data is available. */
|
||||||
SET_TX_FLOW_ON(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;
|
break;
|
||||||
|
|
||||||
case CAIF_CTRLCMD_FLOW_OFF_IND:
|
case CAIF_CTRLCMD_FLOW_OFF_IND:
|
||||||
|
@ -217,7 +217,7 @@ static void caif_sktflowctrl_cb(struct cflayer *layr,
|
||||||
caif_assert(STATE_IS_OPEN(cf_sk));
|
caif_assert(STATE_IS_OPEN(cf_sk));
|
||||||
SET_PENDING_OFF(cf_sk);
|
SET_PENDING_OFF(cf_sk);
|
||||||
SET_TX_FLOW_ON(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;
|
break;
|
||||||
|
|
||||||
case CAIF_CTRLCMD_DEINIT_RSP:
|
case CAIF_CTRLCMD_DEINIT_RSP:
|
||||||
|
@ -225,8 +225,8 @@ static void caif_sktflowctrl_cb(struct cflayer *layr,
|
||||||
caif_assert(!STATE_IS_OPEN(cf_sk));
|
caif_assert(!STATE_IS_OPEN(cf_sk));
|
||||||
SET_PENDING_OFF(cf_sk);
|
SET_PENDING_OFF(cf_sk);
|
||||||
if (!STATE_IS_PENDING_DESTROY(cf_sk)) {
|
if (!STATE_IS_PENDING_DESTROY(cf_sk)) {
|
||||||
if (cf_sk->sk.sk_sleep != NULL)
|
if (sk_sleep(&cf_sk->sk) != NULL)
|
||||||
wake_up_interruptible(cf_sk->sk.sk_sleep);
|
wake_up_interruptible(sk_sleep(&cf_sk->sk));
|
||||||
}
|
}
|
||||||
dbfs_atomic_inc(&cnt.num_deinit);
|
dbfs_atomic_inc(&cnt.num_deinit);
|
||||||
sock_put(&cf_sk->sk);
|
sock_put(&cf_sk->sk);
|
||||||
|
@ -238,7 +238,7 @@ static void caif_sktflowctrl_cb(struct cflayer *layr,
|
||||||
SET_STATE_CLOSED(cf_sk);
|
SET_STATE_CLOSED(cf_sk);
|
||||||
SET_PENDING_OFF(cf_sk);
|
SET_PENDING_OFF(cf_sk);
|
||||||
SET_TX_FLOW_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;
|
break;
|
||||||
|
|
||||||
case CAIF_CTRLCMD_REMOTE_SHUTDOWN_IND:
|
case CAIF_CTRLCMD_REMOTE_SHUTDOWN_IND:
|
||||||
|
@ -247,7 +247,7 @@ static void caif_sktflowctrl_cb(struct cflayer *layr,
|
||||||
/* Use sk_shutdown to indicate remote shutdown indication */
|
/* Use sk_shutdown to indicate remote shutdown indication */
|
||||||
cf_sk->sk.sk_shutdown |= RCV_SHUTDOWN;
|
cf_sk->sk.sk_shutdown |= RCV_SHUTDOWN;
|
||||||
cf_sk->file_mode = 0;
|
cf_sk->file_mode = 0;
|
||||||
wake_up_interruptible(cf_sk->sk.sk_sleep);
|
wake_up_interruptible(sk_sleep(&cf_sk->sk));
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
|
@ -325,7 +325,7 @@ static int caif_recvmsg(struct kiocb *iocb, struct socket *sock,
|
||||||
release_sock(&cf_sk->sk);
|
release_sock(&cf_sk->sk);
|
||||||
|
|
||||||
result =
|
result =
|
||||||
wait_event_interruptible(*cf_sk->sk.sk_sleep,
|
wait_event_interruptible(*sk_sleep(&cf_sk->sk),
|
||||||
!STATE_IS_PENDING(cf_sk));
|
!STATE_IS_PENDING(cf_sk));
|
||||||
|
|
||||||
lock_sock(&(cf_sk->sk));
|
lock_sock(&(cf_sk->sk));
|
||||||
|
@ -365,7 +365,7 @@ static int caif_recvmsg(struct kiocb *iocb, struct socket *sock,
|
||||||
release_sock(&cf_sk->sk);
|
release_sock(&cf_sk->sk);
|
||||||
|
|
||||||
/* Block reader until data arrives or socket is closed. */
|
/* 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)
|
cfpkt_qpeek(cf_sk->pktq)
|
||||||
|| STATE_IS_REMOTE_SHUTDOWN(cf_sk)
|
|| STATE_IS_REMOTE_SHUTDOWN(cf_sk)
|
||||||
|| !STATE_IS_OPEN(cf_sk)) ==
|
|| !STATE_IS_OPEN(cf_sk)) ==
|
||||||
|
@ -537,7 +537,7 @@ static int caif_sendmsg(struct kiocb *kiocb, struct socket *sock,
|
||||||
* for its conclusion.
|
* for its conclusion.
|
||||||
*/
|
*/
|
||||||
result =
|
result =
|
||||||
wait_event_interruptible(*cf_sk->sk.sk_sleep,
|
wait_event_interruptible(*sk_sleep(&cf_sk->sk),
|
||||||
!STATE_IS_PENDING(cf_sk));
|
!STATE_IS_PENDING(cf_sk));
|
||||||
/* I want to be alone on cf_sk (except status and queue) */
|
/* I want to be alone on cf_sk (except status and queue) */
|
||||||
lock_sock(&(cf_sk->sk));
|
lock_sock(&(cf_sk->sk));
|
||||||
|
@ -573,7 +573,7 @@ static int caif_sendmsg(struct kiocb *kiocb, struct socket *sock,
|
||||||
release_sock(&cf_sk->sk);
|
release_sock(&cf_sk->sk);
|
||||||
|
|
||||||
/* Wait until flow is on or socket is closed */
|
/* 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)
|
TX_FLOW_IS_ON(cf_sk)
|
||||||
|| !STATE_IS_OPEN(cf_sk)
|
|| !STATE_IS_OPEN(cf_sk)
|
||||||
|| STATE_IS_REMOTE_SHUTDOWN(cf_sk)
|
|| STATE_IS_REMOTE_SHUTDOWN(cf_sk)
|
||||||
|
@ -650,7 +650,7 @@ static int caif_sendmsg(struct kiocb *kiocb, struct socket *sock,
|
||||||
release_sock(&cf_sk->sk);
|
release_sock(&cf_sk->sk);
|
||||||
|
|
||||||
/* Wait until flow is on or socket is closed */
|
/* 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)
|
TX_FLOW_IS_ON(cf_sk)
|
||||||
|| !STATE_IS_OPEN(cf_sk)
|
|| !STATE_IS_OPEN(cf_sk)
|
||||||
|| STATE_IS_REMOTE_SHUTDOWN(cf_sk)
|
|| STATE_IS_REMOTE_SHUTDOWN(cf_sk)
|
||||||
|
@ -898,7 +898,7 @@ static int caif_connect(struct socket *sock, struct sockaddr *uservaddr,
|
||||||
* for its conclusion.
|
* for its conclusion.
|
||||||
*/
|
*/
|
||||||
result =
|
result =
|
||||||
wait_event_interruptible(*cf_sk->sk.sk_sleep,
|
wait_event_interruptible(*sk_sleep(&cf_sk->sk),
|
||||||
!STATE_IS_PENDING(cf_sk));
|
!STATE_IS_PENDING(cf_sk));
|
||||||
|
|
||||||
lock_sock(&(cf_sk->sk));
|
lock_sock(&(cf_sk->sk));
|
||||||
|
@ -965,7 +965,7 @@ static int caif_connect(struct socket *sock, struct sockaddr *uservaddr,
|
||||||
release_sock(&cf_sk->sk);
|
release_sock(&cf_sk->sk);
|
||||||
|
|
||||||
result =
|
result =
|
||||||
wait_event_interruptible(*cf_sk->sk.sk_sleep,
|
wait_event_interruptible(*sk_sleep(&cf_sk->sk),
|
||||||
!STATE_IS_PENDING(cf_sk));
|
!STATE_IS_PENDING(cf_sk));
|
||||||
|
|
||||||
lock_sock(&(cf_sk->sk));
|
lock_sock(&(cf_sk->sk));
|
||||||
|
@ -1107,7 +1107,7 @@ static int caif_release(struct socket *sock)
|
||||||
* CAIF stack.
|
* CAIF stack.
|
||||||
*/
|
*/
|
||||||
if (!(sock->file->f_flags & O_NONBLOCK)) {
|
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));
|
!STATE_IS_PENDING(cf_sk));
|
||||||
|
|
||||||
if (res == -ERESTARTSYS) {
|
if (res == -ERESTARTSYS) {
|
||||||
|
|
|
@ -91,7 +91,7 @@ int rxrpc_recvmsg(struct kiocb *iocb, struct socket *sock,
|
||||||
|
|
||||||
/* wait for a message to turn up */
|
/* wait for a message to turn up */
|
||||||
release_sock(&rx->sk);
|
release_sock(&rx->sk);
|
||||||
prepare_to_wait_exclusive(rx->sk.sk_sleep, &wait,
|
prepare_to_wait_exclusive(sk_sleep(&rx->sk), &wait,
|
||||||
TASK_INTERRUPTIBLE);
|
TASK_INTERRUPTIBLE);
|
||||||
ret = sock_error(&rx->sk);
|
ret = sock_error(&rx->sk);
|
||||||
if (ret)
|
if (ret)
|
||||||
|
@ -102,7 +102,7 @@ int rxrpc_recvmsg(struct kiocb *iocb, struct socket *sock,
|
||||||
goto wait_interrupted;
|
goto wait_interrupted;
|
||||||
timeo = schedule_timeout(timeo);
|
timeo = schedule_timeout(timeo);
|
||||||
}
|
}
|
||||||
finish_wait(rx->sk.sk_sleep, &wait);
|
finish_wait(sk_sleep(&rx->sk), &wait);
|
||||||
lock_sock(&rx->sk);
|
lock_sock(&rx->sk);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
@ -356,7 +356,7 @@ csum_copy_error:
|
||||||
wait_interrupted:
|
wait_interrupted:
|
||||||
ret = sock_intr_errno(timeo);
|
ret = sock_intr_errno(timeo);
|
||||||
wait_error:
|
wait_error:
|
||||||
finish_wait(rx->sk.sk_sleep, &wait);
|
finish_wait(sk_sleep(&rx->sk), &wait);
|
||||||
if (continue_call)
|
if (continue_call)
|
||||||
rxrpc_put_call(continue_call);
|
rxrpc_put_call(continue_call);
|
||||||
if (copied)
|
if (copied)
|
||||||
|
|
Reference in New Issue