* [PATCH net-next] macvtap: use prepare_to_wait/finish_wait to ensure mb
@ 2012-06-07 8:36 Hong Zhiguo
2012-06-07 20:19 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Hong Zhiguo @ 2012-06-07 8:36 UTC (permalink / raw)
To: davem; +Cc: Hong Zhiguo, netdev, arnd, zhiguo.hong, vikifang
instead of raw assignment to current->state
Signed-off-by: Hong Zhiguo <honkiko@gmail.com>
---
drivers/net/macvtap.c | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
index 2ee56de..0737bd4 100644
--- a/drivers/net/macvtap.c
+++ b/drivers/net/macvtap.c
@@ -847,13 +847,12 @@ static ssize_t macvtap_do_read(struct macvtap_queue *q, struct kiocb *iocb,
const struct iovec *iv, unsigned long len,
int noblock)
{
- DECLARE_WAITQUEUE(wait, current);
+ DEFINE_WAIT(wait);
struct sk_buff *skb;
ssize_t ret = 0;
- add_wait_queue(sk_sleep(&q->sk), &wait);
while (len) {
- current->state = TASK_INTERRUPTIBLE;
+ prepare_to_wait(sk_sleep(&q->sk), &wait, TASK_INTERRUPTIBLE);
/* Read frames from the queue */
skb = skb_dequeue(&q->sk.sk_receive_queue);
@@ -875,8 +874,7 @@ static ssize_t macvtap_do_read(struct macvtap_queue *q, struct kiocb *iocb,
break;
}
- current->state = TASK_RUNNING;
- remove_wait_queue(sk_sleep(&q->sk), &wait);
+ finish_wait(sk_sleep(&q->sk), &wait);
return ret;
}
--
1.7.4.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net-next] macvtap: use prepare_to_wait/finish_wait to ensure mb
2012-06-07 8:36 [PATCH net-next] macvtap: use prepare_to_wait/finish_wait to ensure mb Hong Zhiguo
@ 2012-06-07 20:19 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2012-06-07 20:19 UTC (permalink / raw)
To: honkiko; +Cc: netdev, arnd, zhiguo.hong, vikifang
From: Hong Zhiguo <honkiko@gmail.com>
Date: Thu, 7 Jun 2012 16:36:27 +0800
> instead of raw assignment to current->state
>
> Signed-off-by: Hong Zhiguo <honkiko@gmail.com>
Applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-06-07 20:19 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-06-07 8:36 [PATCH net-next] macvtap: use prepare_to_wait/finish_wait to ensure mb Hong Zhiguo
2012-06-07 20:19 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).