summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorJan Kara <jack@suse.cz>2014-10-01 21:49:46 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-11-14 08:59:58 -0800
commit78cee20d970646bda1071ae43de5db29267d8e45 (patch)
tree83f36f124209eedcb260ee589a096ebdeb458c9b /fs
parent95fda6045c22eb6c682b89a15b37d2f2e789caee (diff)
downloadlwn-78cee20d970646bda1071ae43de5db29267d8e45.tar.gz
lwn-78cee20d970646bda1071ae43de5db29267d8e45.zip
ext4: fix mmap data corruption when blocksize < pagesize
commit d6320cbfc92910a3e5f10c42d98c231c98db4f60 upstream. Use truncate_isize_extended() when hole is being created in a file so that ->page_mkwrite() will get called for the partial tail page if it is mmaped (see the first patch in the series for details). Signed-off-by: Jan Kara <jack@suse.cz> Signed-off-by: Theodore Ts'o <tytso@mit.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/ext4/inode.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index b56062dc8b62..6b6e8c5a319d 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -4645,8 +4645,12 @@ int ext4_setattr(struct dentry *dentry, struct iattr *attr)
ext4_orphan_del(NULL, inode);
goto err_out;
}
- } else
+ } else {
+ loff_t oldsize = inode->i_size;
+
i_size_write(inode, attr->ia_size);
+ pagecache_isize_extended(inode, oldsize, inode->i_size);
+ }
/*
* Blocks are going to be removed from the inode. Wait