From 9a8bb64c9155e0d6a54ee47ab259d0cdb34f0e74 Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Fri, 29 Oct 2010 20:44:44 +0000 Subject: [PATCH] --- yaml --- r: 224115 b: refs/heads/master c: 67426b756c4d52c511c4b22b269accea171692a8 h: refs/heads/master i: 224113: 9b356442a5e6185d235a333e9dc99807367ce3ee 224111: 69dd183b838e544692e01c000840b096cd1ac63c v: v3 --- [refs] | 2 +- trunk/net/unix/af_unix.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c27af56f8477..ccb261636f26 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fc766e4c4965915ab52a1d1fa3c7a7b3e7bc07f0 +refs/heads/master: 67426b756c4d52c511c4b22b269accea171692a8 diff --git a/trunk/net/unix/af_unix.c b/trunk/net/unix/af_unix.c index 3c95304a0817..f33c5958dbb2 100644 --- a/trunk/net/unix/af_unix.c +++ b/trunk/net/unix/af_unix.c @@ -316,7 +316,8 @@ static void unix_write_space(struct sock *sk) if (unix_writable(sk)) { wq = rcu_dereference(sk->sk_wq); if (wq_has_sleeper(wq)) - wake_up_interruptible_sync(&wq->wait); + wake_up_interruptible_sync_poll(&wq->wait, + POLLOUT | POLLWRNORM | POLLWRBAND); sk_wake_async(sk, SOCK_WAKE_SPACE, POLL_OUT); } rcu_read_unlock(); @@ -1710,7 +1711,8 @@ static int unix_dgram_recvmsg(struct kiocb *iocb, struct socket *sock, goto out_unlock; } - wake_up_interruptible_sync(&u->peer_wait); + wake_up_interruptible_sync_poll(&u->peer_wait, + POLLOUT | POLLWRNORM | POLLWRBAND); if (msg->msg_name) unix_copy_addr(msg, skb->sk);