git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'xen/xenbus' into upstream/xen
[pandora-kernel.git]
/
drivers
/
xen
/
xenfs
/
xenbus.c
diff --git
a/drivers/xen/xenfs/xenbus.c
b/drivers/xen/xenfs/xenbus.c
index
f28ece3
..
3b39c37
100644
(file)
--- a/
drivers/xen/xenfs/xenbus.c
+++ b/
drivers/xen/xenfs/xenbus.c
@@
-124,6
+124,9
@@
static ssize_t xenbus_file_read(struct file *filp,
mutex_lock(&u->reply_mutex);
while (list_empty(&u->read_buffers)) {
mutex_unlock(&u->reply_mutex);
+ if (filp->f_flags & O_NONBLOCK)
+ return -EAGAIN;
+
ret = wait_event_interruptible(u->read_waitq,
!list_empty(&u->read_buffers));
if (ret)