summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorJan Kara <jack@suse.cz>2014-10-01 21:49:46 -0400
committerJiri Slaby <jslaby@suse.cz>2014-11-13 19:02:34 +0100
commit97f94c2e2fe51803a074d4e50de0049a243391eb (patch)
tree102760e4d9de68007a97bd3b3c346305c2620fb2 /fs
parent0dce193f3456fe009fc3c588f4ac39f33446df61 (diff)
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: Jiri Slaby <jslaby@suse.cz>
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 d65a6260ad61..474b9eafee43 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -4655,8 +4655,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