2023-07-05 19:12:11

by Jeffrey Layton

Subject: [PATCH v2 44/92] fat: convert to ctime accessor functions

In later patches, we're going to change how the inode's ctime field is
used. Switch to using accessor functions instead of raw accesses of
inode->i_ctime.

Signed-off-by: Jeff Layton <[email protected]>
---
fs/fat/inode.c | 7 ++++---
fs/fat/misc.c | 3 ++-
2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/fs/fat/inode.c b/fs/fat/inode.c
index d99b8549ec8f..2be40ff8a74f 100644
--- a/fs/fat/inode.c
+++ b/fs/fat/inode.c
@@ -562,7 +562,7 @@ int fat_fill_inode(struct inode *inode, struct msdos_dir_entry *de)
& ~((loff_t)sbi->cluster_size - 1)) >> 9;

fat_time_fat2unix(sbi, &inode->i_mtime, de->time, de->date, 0);
- inode->i_ctime = inode->i_mtime;
+ inode_set_ctime_to_ts(inode, inode->i_mtime);
if (sbi->options.isvfat) {
fat_time_fat2unix(sbi, &inode->i_atime, 0, de->adate, 0);
fat_time_fat2unix(sbi, &MSDOS_I(inode)->i_crtime, de->ctime,
@@ -1407,8 +1407,9 @@ static int fat_read_root(struct inode *inode)
MSDOS_I(inode)->mmu_private = inode->i_size;

fat_save_attrs(inode, ATTR_DIR);
- inode->i_mtime.tv_sec = inode->i_atime.tv_sec = inode->i_ctime.tv_sec = 0;
- inode->i_mtime.tv_nsec = inode->i_atime.tv_nsec = inode->i_ctime.tv_nsec = 0;
+ inode->i_mtime.tv_sec = inode->i_atime.tv_sec = inode_set_ctime(inode,
+ 0, 0).tv_sec;
+ inode->i_mtime.tv_nsec = inode->i_atime.tv_nsec = 0;
set_nlink(inode, fat_subdirs(inode)+2);

return 0;
diff --git a/fs/fat/misc.c b/fs/fat/misc.c
index 7e5d6ae305f2..67006ea08db6 100644
--- a/fs/fat/misc.c
+++ b/fs/fat/misc.c
@@ -332,7 +332,8 @@ int fat_truncate_time(struct inode *inode, struct timespec64 *now, int flags)
* but ctime updates are ignored.
*/
if (flags & S_MTIME)
- inode->i_mtime = inode->i_ctime = fat_truncate_mtime(sbi, now);
+ inode->i_mtime = inode_set_ctime_to_ts(inode,
+ fat_truncate_mtime(sbi, now));

return 0;
}
--
2.41.0

2023-07-06 02:09:06

by OGAWA Hirofumi

Subject: Re: [PATCH v2 44/92] fat: convert to ctime accessor functions

Jeff Layton <[email protected]> writes:

> @@ -1407,8 +1407,9 @@ static int fat_read_root(struct inode *inode)
> MSDOS_I(inode)->mmu_private = inode->i_size;
>
> fat_save_attrs(inode, ATTR_DIR);
> - inode->i_mtime.tv_sec = inode->i_atime.tv_sec = inode->i_ctime.tv_sec = 0;
> - inode->i_mtime.tv_nsec = inode->i_atime.tv_nsec = inode->i_ctime.tv_nsec = 0;
> + inode->i_mtime.tv_sec = inode->i_atime.tv_sec = inode_set_ctime(inode,
> + 0, 0).tv_sec;
> + inode->i_mtime.tv_nsec = inode->i_atime.tv_nsec = 0;

Maybe, this should simply be

inode->i_mtime = inode->i_atime = inode_set_ctime(inode, 0, 0);

?

Thanks.
--
OGAWA Hirofumi <[email protected]>

2023-07-06 11:55:59

by Jeffrey Layton

Subject: Re: [PATCH v2 44/92] fat: convert to ctime accessor functions

On Thu, 2023-07-06 at 10:54 +0900, OGAWA Hirofumi wrote:
> Jeff Layton <[email protected]> writes:
>
> > @@ -1407,8 +1407,9 @@ static int fat_read_root(struct inode *inode)
> > MSDOS_I(inode)->mmu_private = inode->i_size;
> >
> > fat_save_attrs(inode, ATTR_DIR);
> > - inode->i_mtime.tv_sec = inode->i_atime.tv_sec = inode->i_ctime.tv_sec = 0;
> > - inode->i_mtime.tv_nsec = inode->i_atime.tv_nsec = inode->i_ctime.tv_nsec = 0;
> > + inode->i_mtime.tv_sec = inode->i_atime.tv_sec = inode_set_ctime(inode,
> > + 0, 0).tv_sec;
> > + inode->i_mtime.tv_nsec = inode->i_atime.tv_nsec = 0;
>
> Maybe, this should simply be
>
> inode->i_mtime = inode->i_atime = inode_set_ctime(inode, 0, 0);
>

Yes, that would be clearer. Chalk that one up to the automated
coccinelle conversion. I've fixed it in my ctime-next branch.

Thanks!
--
Jeff Layton <[email protected]>