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

macvtap: use prepare_to_wait/finish_wait to ensure mb

Browse Source 
instead of raw assignment to current->state

Signed-off-by: Hong Zhiguo <honkiko@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Hong zhi guo 2012-06-06 22:36:27 +00:00 committed by David S. Miller
parent e9939c80e9
commit ccf7e72b54
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/macvtap.c
View File

@ -847,13 +847,12 @@ static ssize_t macvtap_do_read(struct macvtap_queue *q, struct kiocb *iocb,
const struct iovec *iv, unsigned long len, const struct iovec *iv, unsigned long len,
int noblock) int noblock)
{ {
DECLARE_WAITQUEUE(wait, current); DEFINE_WAIT(wait);
struct sk_buff *skb; struct sk_buff *skb;
ssize_t ret = 0; ssize_t ret = 0;
add_wait_queue(sk_sleep(&q->sk), &wait);
while (len) { while (len) {
current->state = TASK_INTERRUPTIBLE; prepare_to_wait(sk_sleep(&q->sk), &wait, TASK_INTERRUPTIBLE);
/* Read frames from the queue */ /* Read frames from the queue */
skb = skb_dequeue(&q->sk.sk_receive_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; break;
} }
current->state = TASK_RUNNING; finish_wait(sk_sleep(&q->sk), &wait);
remove_wait_queue(sk_sleep(&q->sk), &wait);
return ret; return ret;
} }