Skip to content

Commit

Permalink
fuse: fix fuse_write_end() if zero bytes were copied
Browse files Browse the repository at this point in the history
If pos is at the beginning of a page and copied is zero then page is not
zeroed but is marked uptodate.

Fix by skipping everything except unlock/put of page if zero bytes were
copied.

Reported-by: Al Viro <viro@zeniv.linux.org.uk>
Fixes: 6b12c1b ("fuse: Implement write_begin/write_end callbacks")
Cc: <stable@vger.kernel.org> # v3.15+
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
  • Loading branch information
Miklos Szeredi committed Nov 15, 2016
1 parent 0ce267f commit 59c3b76
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions fs/fuse/file.c
Original file line number Diff line number Diff line change
Expand Up @@ -1985,6 +1985,10 @@ static int fuse_write_end(struct file *file, struct address_space *mapping,
{
struct inode *inode = page->mapping->host;

/* Haven't copied anything? Skip zeroing, size extending, dirtying. */
if (!copied)
goto unlock;

if (!PageUptodate(page)) {
/* Zero any unwritten bytes at the end of the page */
size_t endoff = (pos + copied) & ~PAGE_MASK;
Expand All @@ -1995,6 +1999,8 @@ static int fuse_write_end(struct file *file, struct address_space *mapping,

fuse_write_update_size(inode, pos + copied);
set_page_dirty(page);

unlock:
unlock_page(page);
put_page(page);

Expand Down

0 comments on commit 59c3b76

Please sign in to comment.