Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-12 07:01:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

virtio: console: Rename wait_is_over() to will_read_block()

Browse Source 
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>
This commit is contained in:
Amit Shah 2010-05-19 22:15:49 -06:00 committed by Rusty Russell
parent 1d05160be7
commit 60caacd3ee
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/char/virtio_console.c
View File

@ -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 */ /* 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, 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; return -EAGAIN;
ret = wait_event_interruptible(port->waitqueue, ret = wait_event_interruptible(port->waitqueue,
wait_is_over(port)); !will_read_block(port));
if (ret < 0) if (ret < 0)
return ret; return ret;
} }