From 6513a8e0b12170643753a2db17a68568d3864feb Mon Sep 17 00:00:00 2001
From: Jeff Dike <jdike@addtoit.com>
Date: Mon, 10 Apr 2006 22:54:53 -0700
Subject: [PATCH] --- yaml --- r: 25552 b: refs/heads/master c:
 e5ac1d1e70a8c19a65a959d73650203df7a2e168 h: refs/heads/master v: v3

---
 [refs]              | 2 +-
 trunk/fs/fuse/dev.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index fb9e50d337b9..e2962872e42a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 385a17bfc3cb035333c8a91eddc78a6e04c4625e
+refs/heads/master: e5ac1d1e70a8c19a65a959d73650203df7a2e168
diff --git a/trunk/fs/fuse/dev.c b/trunk/fs/fuse/dev.c
index 438770f8867f..75c6e9166c39 100644
--- a/trunk/fs/fuse/dev.c
+++ b/trunk/fs/fuse/dev.c
@@ -619,6 +619,12 @@ static ssize_t fuse_dev_readv(struct file *file, const struct iovec *iov,
 	err = -EPERM;
 	if (!fc)
 		goto err_unlock;
+
+	err = -EAGAIN;
+	if ((file->f_flags & O_NONBLOCK) && fc->connected &&
+	    list_empty(&fc->pending))
+		goto err_unlock;
+
 	request_wait(fc);
 	err = -ENODEV;
 	if (!fc->connected)