diff options
| author | Nick Piggin <npiggin@suse.de> | 2010-06-03 22:01:46 +1000 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2010-06-04 17:16:30 -0400 |
| commit | af5a30d8cfcfc561336f982b06345d6b815e0bb3 (patch) | |
| tree | eb4e6fb6873355a2a96b698aeb371eb058a88c87 | |
| parent | 8718d36cf99f5acf0f37487557ec25aee54b930b (diff) | |
| download | linux-3.10-af5a30d8cfcfc561336f982b06345d6b815e0bb3.tar.gz linux-3.10-af5a30d8cfcfc561336f982b06345d6b815e0bb3.tar.bz2 linux-3.10-af5a30d8cfcfc561336f982b06345d6b815e0bb3.zip | |
fix truncate inode time modification breakage
mtime and ctime should be changed only if the file size has actually
changed. Patches changing ext2 and tmpfs from vmtruncate to new truncate
sequence has caused regressions where they always update timestamps.
There is some strange cases in POSIX where truncate(2) must not update
times unless the size has acutally changed, see 6e656be89.
This area is all still rather buggy in different ways in a lot of
filesystems and needs a cleanup and audit (ideally the vfs will provide
a simple attribute or call to direct all filesystems exactly which
attributes to change). But coming up with the best solution will take a
while and is not appropriate for rc anyway.
So fix recent regression for now.
Signed-off-by: Nick Piggin <npiggin@suse.de>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| -rw-r--r-- | fs/ext2/inode.c | 2 | ||||
| -rw-r--r-- | mm/shmem.c | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c index 19214435b75..3675088cb88 100644 --- a/fs/ext2/inode.c +++ b/fs/ext2/inode.c @@ -1552,7 +1552,7 @@ int ext2_setattr(struct dentry *dentry, struct iattr *iattr) if (error) return error; } - if (iattr->ia_valid & ATTR_SIZE) { + if (iattr->ia_valid & ATTR_SIZE && iattr->ia_size != inode->i_size) { error = ext2_setsize(inode, iattr->ia_size); if (error) return error; diff --git a/mm/shmem.c b/mm/shmem.c index 7e5030ae18f..f65f84062db 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -764,10 +764,11 @@ done2: static int shmem_notify_change(struct dentry *dentry, struct iattr *attr) { struct inode *inode = dentry->d_inode; + loff_t newsize = attr->ia_size; int error; - if (S_ISREG(inode->i_mode) && (attr->ia_valid & ATTR_SIZE)) { - loff_t newsize = attr->ia_size; + if (S_ISREG(inode->i_mode) && (attr->ia_valid & ATTR_SIZE) + && newsize != inode->i_size) { struct page *page = NULL; if (newsize < inode->i_size) { |