From mboxrd@z Thu Jan 1 00:00:00 1970 From: Pavel Emelyanov Subject: [PATCH 3/10] fuse: Prepare to handle short reads Date: Tue, 03 Jul 2012 19:54:45 +0400 Message-ID: <4FF315C5.9010809@parallels.com> References: <4FF3156E.8030109@parallels.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: James Bottomley , Kirill Korotaev To: fuse-devel@lists.sourceforge.net, Miklos Szeredi , Alexander Viro , linux-fsdevel Return-path: Received: from mailhub.sw.ru ([195.214.232.25]:28207 "EHLO relay.sw.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752339Ab2GCPzE (ORCPT ); Tue, 3 Jul 2012 11:55:04 -0400 In-Reply-To: <4FF3156E.8030109@parallels.com> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: A helper which gets called when read reports less bytes than was requested. See patch #6 (trust kernel i_size only) for details. Signed-off-by: Pavel Emelyanov --- fs/fuse/file.c | 20 ++++++++++++-------- 1 files changed, 12 insertions(+), 8 deletions(-) diff --git a/fs/fuse/file.c b/fs/fuse/file.c index 9c32bf5..6bf9723 100644 --- a/fs/fuse/file.c +++ b/fs/fuse/file.c @@ -538,6 +538,14 @@ static void fuse_read_update_size(struct inode *inode, loff_t size, spin_unlock(&fc->lock); } +static void fuse_short_read(struct fuse_req *req, struct inode *inode, u64 attr_ver) +{ + size_t num_read = req->out.args[0].size; + + loff_t pos = page_offset(req->pages[0]) + num_read; + fuse_read_update_size(inode, pos, attr_ver); +} + static int fuse_readpage(struct file *file, struct page *page) { struct inode *inode = page->mapping->host; @@ -573,18 +581,18 @@ static int fuse_readpage(struct file *file, struct page *page) req->pages[0] = page; num_read = fuse_send_read(req, file, pos, count, NULL); err = req->out.h.error; - fuse_put_request(fc, req); if (!err) { /* * Short read means EOF. If file size is larger, truncate it */ if (num_read < count) - fuse_read_update_size(inode, pos + num_read, attr_ver); + fuse_short_read(req, inode, attr_ver); SetPageUptodate(page); } + fuse_put_request(fc, req); fuse_invalidate_attr(inode); /* atime changed */ out: unlock_page(page); @@ -607,13 +615,9 @@ static void fuse_readpages_end(struct fuse_conn *fc, struct fuse_req *req) /* * Short read means EOF. If file size is larger, truncate it */ - if (!req->out.h.error && num_read < count) { - loff_t pos; + if (!req->out.h.error && num_read < count) + fuse_short_read(req, inode, req->misc.read.attr_ver); - pos = page_offset(req->pages[0]) + num_read; - fuse_read_update_size(inode, pos, - req->misc.read.attr_ver); - } fuse_invalidate_attr(inode); /* atime changed */ } -- 1.5.5.6