leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[IrDA] af_irda: irda_recvmsg_stream cleanup

Browse Source 
This patch cleans up some code in irda_recvmsg_stream, replacing some
homebrew code with prepare_to_wait/finish_wait, and by making the
code honor sock_rcvtimeo.

Signed-off-by: Olaf Kirch <olaf.kirch@oracle.com>
Signed-off-by: Samuel Ortiz <samuel@sortiz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Olaf Kirch 2007-04-20 22:05:27 -07:00 committed by David S. Miller
parent 9958089a43
commit 305f2aa182
1 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
net/irda/af_irda.c
View File

@ -1402,8 +1402,8 @@ static int irda_recvmsg_stream(struct kiocb *iocb, struct socket *sock,
struct irda_sock *self = irda_sk(sk); struct irda_sock *self = irda_sk(sk);
int noblock = flags & MSG_DONTWAIT; int noblock = flags & MSG_DONTWAIT;
size_t copied = 0; size_t copied = 0;
int target = 1; int target;
DECLARE_WAITQUEUE(waitq, current); long timeo;
IRDA_DEBUG(3, "%s()\n", __FUNCTION__); IRDA_DEBUG(3, "%s()\n", __FUNCTION__);
@ -1416,8 +1416,8 @@ static int irda_recvmsg_stream(struct kiocb *iocb, struct socket *sock,
if (flags & MSG_OOB) if (flags & MSG_OOB)
return -EOPNOTSUPP; return -EOPNOTSUPP;
if (flags & MSG_WAITALL) target = sock_rcvlowat(sk, flags & MSG_WAITALL, size);
target = size; timeo = sock_rcvtimeo(sk, noblock);
msg->msg_namelen = 0; msg->msg_namelen = 0;
@ -1425,19 +1425,14 @@ static int irda_recvmsg_stream(struct kiocb *iocb, struct socket *sock,
int chunk; int chunk;
struct sk_buff *skb = skb_dequeue(&sk->sk_receive_queue); struct sk_buff *skb = skb_dequeue(&sk->sk_receive_queue);
if (skb==NULL) { if (skb == NULL) {
DEFINE_WAIT(wait);
int ret = 0; int ret = 0;
if (copied >= target) if (copied >= target)
break; break;
/* The following code is a cut'n'paste of the prepare_to_wait_exclusive(sk->sk_sleep, &wait, TASK_INTERRUPTIBLE);
* wait_event_interruptible() macro.
* We don't us the macro because the test condition
* is messy. - Jean II */
set_bit(SOCK_ASYNC_WAITDATA, &sk->sk_socket->flags);
add_wait_queue(sk->sk_sleep, &waitq);
set_current_state(TASK_INTERRUPTIBLE);
/* /*
* POSIX 1003.1g mandates this order. * POSIX 1003.1g mandates this order.
@ -1450,17 +1445,17 @@ static int irda_recvmsg_stream(struct kiocb *iocb, struct socket *sock,
else if (noblock) else if (noblock)
ret = -EAGAIN; ret = -EAGAIN;
else if (signal_pending(current)) else if (signal_pending(current))
ret = -ERESTARTSYS; ret = sock_intr_errno(timeo);
else if (sk->sk_state != TCP_ESTABLISHED)
ret = -ENOTCONN;
else if (skb_peek(&sk->sk_receive_queue) == NULL) else if (skb_peek(&sk->sk_receive_queue) == NULL)
/* Wait process until data arrives */ /* Wait process until data arrives */
schedule(); schedule();
current->state = TASK_RUNNING; finish_wait(sk->sk_sleep, &wait);
remove_wait_queue(sk->sk_sleep, &waitq);
clear_bit(SOCK_ASYNC_WAITDATA, &sk->sk_socket->flags);
if(ret) if (ret)
return(ret); return ret;
if (sk->sk_shutdown & RCV_SHUTDOWN) if (sk->sk_shutdown & RCV_SHUTDOWN)
break; break;