Skip to content

Commit

Permalink
virtio: console: Rename wait_is_over() to will_read_block()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Amit Shah authored and Rusty Russell committed May 19, 2010
1 parent 1d05160 commit 60caacd
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/char/virtio_console.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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;
}
Expand Down

0 comments on commit 60caacd

Please sign in to comment.