From cfdcfd9c49f0f963d9f6f4347be6edf8da46a1ea Mon Sep 17 00:00:00 2001 From: Miklos Szeredi Date: Mon, 10 Apr 2006 22:54:49 -0700 Subject: [PATCH] --- yaml --- r: 25549 b: refs/heads/master c: d3406ffa4af8af1d7c14cff06e003eb0a557d4ad h: refs/heads/master i: 25547: b903df07408c397f36075075268f1714a7dd62d2 v: v3 --- [refs] | 2 +- trunk/fs/fuse/file.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 5d17938e5c1f..831bdbf3c31d 100644 --- 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 index 975f2697e866..3ac39c0288de 100644 --- 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; }