diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-11-08 13:33:47 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-11-08 13:33:47 -0800 |
| commit | 67c0afb6424fee94238d9a32b97c407d0c97155e (patch) | |
| tree | de4eb1ccd4abf0e6c93702564ef9e23c2846f686 | |
| parent | 34f763262743aac0847b15711b0460ac6d6943d5 (diff) | |
| parent | 1373ca10ec04afba9199de1fab01fde91338a78b (diff) | |
| download | linux-67c0afb6424fee94238d9a32b97c407d0c97155e.tar.gz | |
Merge tag 'exfat-for-6.7-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat
Pull exfat updates from Namjae Jeon:
- Fix an issue that exfat timestamps are not updated caused by new
timestamp accessor function patch
* tag 'exfat-for-6.7-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat:
exfat: fix ctime is not updated
exfat: fix setting uninitialized time to ctime/atime
| -rw-r--r-- | fs/exfat/file.c | 1 | ||||
| -rw-r--r-- | fs/exfat/inode.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/fs/exfat/file.c b/fs/exfat/file.c index 02c4e2937879e9..bfdfafe0099309 100644 --- a/fs/exfat/file.c +++ b/fs/exfat/file.c @@ -295,6 +295,7 @@ int exfat_setattr(struct mnt_idmap *idmap, struct dentry *dentry, if (attr->ia_valid & ATTR_SIZE) inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode)); + setattr_copy(&nop_mnt_idmap, inode, attr); exfat_truncate_inode_atime(inode); if (attr->ia_valid & ATTR_SIZE) { diff --git a/fs/exfat/inode.c b/fs/exfat/inode.c index 875234179d1f61..e7ff58b8e68c78 100644 --- a/fs/exfat/inode.c +++ b/fs/exfat/inode.c @@ -56,18 +56,18 @@ int __exfat_write_inode(struct inode *inode, int sync) &ep->dentry.file.create_time, &ep->dentry.file.create_date, &ep->dentry.file.create_time_cs); + ts = inode_get_mtime(inode); exfat_set_entry_time(sbi, &ts, &ep->dentry.file.modify_tz, &ep->dentry.file.modify_time, &ep->dentry.file.modify_date, &ep->dentry.file.modify_time_cs); - inode_set_mtime_to_ts(inode, ts); + ts = inode_get_atime(inode); exfat_set_entry_time(sbi, &ts, &ep->dentry.file.access_tz, &ep->dentry.file.access_time, &ep->dentry.file.access_date, NULL); - inode_set_atime_to_ts(inode, ts); /* File size should be zero if there is no cluster allocated */ on_disk_size = i_size_read(inode); |