From: Eryu Guan Date: Tue, 28 Jul 2015 19:08:41 +0000 (-0400) Subject: ext4: update c/mtime on truncate up X-Git-Tag: v4.1.12-92~100^2~1 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=bd348721b6345130ad1a8a1cb43f33f1518986ff;p=users%2Fjedix%2Flinux-maple.git ext4: update c/mtime on truncate up Commit 3da40c7b0898 ("ext4: only call ext4_truncate when size <= isize") introduced a bug that c/mtime is not updated on truncate up. Fix the issue by setting c/mtime explicitly in the truncate up case. Note that ftruncate(2) is not affected, so you won't see this bug using truncate(1) and xfs_io(1). Orabug: 24377419 Signed-off-by: Zirong Lang Signed-off-by: Eryu Guan Signed-off-by: Theodore Ts'o Signed-off-by: Ashok Vairavan Reviewed-By: Dan Duval --- diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 0554b0b5957b..00bd1ba37383 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -4708,6 +4708,14 @@ int ext4_setattr(struct dentry *dentry, struct iattr *attr) error = ext4_orphan_add(handle, inode); orphan = 1; } + /* + * Update c/mtime on truncate up, ext4_truncate() will + * update c/mtime in shrink case below + */ + if (!shrink) { + inode->i_mtime = ext4_current_time(inode); + inode->i_ctime = inode->i_mtime; + } down_write(&EXT4_I(inode)->i_data_sem); EXT4_I(inode)->i_disksize = attr->ia_size; rc = ext4_mark_inode_dirty(handle, inode);