---

yaml --- r: 25549 b: refs/heads/master c: d3406ff h: refs/heads/master i: 25547: b903df0 v: v3
git-mirror · Apr 11, 2006 · cfdcfd9 · cfdcfd9
1 parent 334d028
commit cfdcfd9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3e16f6afb267c0256416d481862ce8019c33417d
+refs/heads/master: d3406ffa4af8af1d7c14cff06e003eb0a557d4ad
diff --git a/trunk/fs/fuse/file.c b/trunk/fs/fuse/file.c
@@ -397,8 +397,12 @@ static int fuse_readpages(struct file *file, struct address_space *mapping,
 		return -EINTR;
 
 	err = read_cache_pages(mapping, pages, fuse_readpages_fill, &data);
-	if (!err)
-		fuse_send_readpages(data.req, file, inode);
+	if (!err) {
+		if (data.req->num_pages)
+			fuse_send_readpages(data.req, file, inode);
+		else
+			fuse_put_request(fc, data.req);
+	}
 	return err;
 }