summaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorAmit Shah <amit.shah@redhat.com>2010-05-19 22:15:49 -0600
committerRusty Russell <rusty@rustcorp.com.au>2010-05-19 22:15:50 +0930
commit60caacd3eeab68672961e88db01e26735527d521 (patch)
tree687dc4dcc2fac6cce97ba8347abb88fccee95a15 /drivers/char
parent1d05160be743c506b1d6926e7c637496fa750cd3 (diff)
downloadlinux-stable-60caacd3eeab68672961e88db01e26735527d521.tar.gz
linux-stable-60caacd3eeab68672961e88db01e26735527d521.tar.bz2
linux-stable-60caacd3eeab68672961e88db01e26735527d521.zip
virtio: console: Rename wait_is_over() to will_read_block()
We'll introduce a function that checks if write will block. Have function names that are similar for the two cases. Signed-off-by: Amit Shah <amit.shah@redhat.com> Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/virtio_console.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
index 6207e3729923..a39bf191da02 100644
--- a/drivers/char/virtio_console.c
+++ b/drivers/char/virtio_console.c
@@ -479,9 +479,9 @@ static ssize_t fill_readbuf(struct port *port, char *out_buf, size_t out_count,
}
/* The condition that must be true for polling to end */
-static bool wait_is_over(struct port *port)
+static bool will_read_block(struct port *port)
{
- return port_has_data(port) || !port->host_connected;
+ return !port_has_data(port) && port->host_connected;
}
static ssize_t port_fops_read(struct file *filp, char __user *ubuf,
@@ -504,7 +504,7 @@ static ssize_t port_fops_read(struct file *filp, char __user *ubuf,
return -EAGAIN;
ret = wait_event_interruptible(port->waitqueue,
- wait_is_over(port));
+ !will_read_block(port));
if (ret < 0)
return ret;
}