Commit 67c0afb6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'exfat-for-6.7-rc1-part2' of... 

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
parents 34f76326 1373ca10

fs/exfat/file.c

+1 −0
Original line number Diff line number Diff line
@@ -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) {

fs/exfat/inode.c

+2 −2
Original line number Diff line number Diff line
@@ -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);