---

yaml --- r: 25552 b: refs/heads/master c: e5ac1d1 h: refs/heads/master v: v3
git-mirror · Apr 11, 2006 · 6513a8e · 6513a8e
1 parent 3bc94be
commit 6513a8e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git 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
@@ -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)