From: Amit Shah Date: Thu, 20 May 2010 04:15:49 +0000 (-0600) Subject: virtio: console: Rename wait_is_over() to will_read_block() X-Git-Tag: v2.6.35-rc1~435^2~5 X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=60caacd3eeab68672961e88db01e26735527d521;p=cascardo%2Flinux.git 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 Signed-off-by: Rusty Russell --- 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; }