From patchwork Sat Jan 5 09:34:06 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [V2,3/3] tuntap: don't add to waitqueue when POLLERR Date: Fri, 04 Jan 2013 23:34:06 -0000 From: Jason Wang X-Patchwork-Id: 209656 Message-Id: <1357378446-19656-4-git-send-email-jasowang@redhat.com> To: davem@davemloft.net, mst@redhat.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Jason Wang Currently, tun_chr_poll() returns POLLERR after waitqueue adding during device unregistration. This would confuse some of its user such as vhost which assume when POLLERR is returned, it wasn't added to the waitqueue. Fix this by returning POLLERR before adding to waitqueue. Signed-off-by: Jason Wang --- drivers/net/tun.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/drivers/net/tun.c b/drivers/net/tun.c index fbd106e..f9c0049 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -886,7 +886,7 @@ static unsigned int tun_chr_poll(struct file *file, poll_table *wait) struct sock *sk; unsigned int mask = 0; - if (!tun) + if (!tun || tun->dev->reg_state != NETREG_REGISTERED) return POLLERR; sk = tfile->socket.sk; @@ -903,9 +903,6 @@ static unsigned int tun_chr_poll(struct file *file, poll_table *wait) sock_writeable(sk))) mask |= POLLOUT | POLLWRNORM; - if (tun->dev->reg_state != NETREG_REGISTERED) - mask = POLLERR; - tun_put(tun); return mask; }