On Wed 05-07-23 15:01:13, Jeff Layton wrote:
> 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 <jlayton@xxxxxxxxxx>
Looks good. Feel free to add:
Reviewed-by: Jan Kara <jack@xxxxxxx>
Honza
> ---
> fs/hfs/catalog.c | 8 ++++----
> fs/hfs/dir.c | 2 +-
> fs/hfs/inode.c | 13 ++++++-------
> fs/hfs/sysdep.c | 4 +++-
> 4 files changed, 14 insertions(+), 13 deletions(-)
>
> diff --git a/fs/hfs/catalog.c b/fs/hfs/catalog.c
> index d365bf0b8c77..632c226a3972 100644
> --- a/fs/hfs/catalog.c
> +++ b/fs/hfs/catalog.c
> @@ -133,7 +133,7 @@ int hfs_cat_create(u32 cnid, struct inode *dir, const struct qstr *str, struct i
> goto err1;
>
> dir->i_size++;
> - dir->i_mtime = dir->i_ctime = current_time(dir);
> + dir->i_mtime = inode_set_ctime_current(dir);
> mark_inode_dirty(dir);
> hfs_find_exit(&fd);
> return 0;
> @@ -269,7 +269,7 @@ int hfs_cat_delete(u32 cnid, struct inode *dir, const struct qstr *str)
> }
>
> dir->i_size--;
> - dir->i_mtime = dir->i_ctime = current_time(dir);
> + dir->i_mtime = inode_set_ctime_current(dir);
> mark_inode_dirty(dir);
> res = 0;
> out:
> @@ -337,7 +337,7 @@ int hfs_cat_move(u32 cnid, struct inode *src_dir, const struct qstr *src_name,
> if (err)
> goto out;
> dst_dir->i_size++;
> - dst_dir->i_mtime = dst_dir->i_ctime = current_time(dst_dir);
> + dst_dir->i_mtime = inode_set_ctime_current(dst_dir);
> mark_inode_dirty(dst_dir);
>
> /* finally remove the old entry */
> @@ -349,7 +349,7 @@ int hfs_cat_move(u32 cnid, struct inode *src_dir, const struct qstr *src_name,
> if (err)
> goto out;
> src_dir->i_size--;
> - src_dir->i_mtime = src_dir->i_ctime = current_time(src_dir);
> + src_dir->i_mtime = inode_set_ctime_current(src_dir);
> mark_inode_dirty(src_dir);
>
> type = entry.type;
> diff --git a/fs/hfs/dir.c b/fs/hfs/dir.c
> index 3e1e3dcf0b48..b75c26045df4 100644
> --- a/fs/hfs/dir.c
> +++ b/fs/hfs/dir.c
> @@ -263,7 +263,7 @@ static int hfs_remove(struct inode *dir, struct dentry *dentry)
> if (res)
> return res;
> clear_nlink(inode);
> - inode->i_ctime = current_time(inode);
> + inode_set_ctime_current(inode);
> hfs_delete_inode(inode);
> mark_inode_dirty(inode);
> return 0;
> diff --git a/fs/hfs/inode.c b/fs/hfs/inode.c
> index 441d7fc952e3..ee349b72cfb3 100644
> --- a/fs/hfs/inode.c
> +++ b/fs/hfs/inode.c
> @@ -200,7 +200,7 @@ struct inode *hfs_new_inode(struct inode *dir, const struct qstr *name, umode_t
> inode->i_uid = current_fsuid();
> inode->i_gid = current_fsgid();
> set_nlink(inode, 1);
> - inode->i_mtime = inode->i_atime = inode->i_ctime = current_time(inode);
> + inode->i_mtime = inode->i_atime = inode_set_ctime_current(inode);
> HFS_I(inode)->flags = 0;
> HFS_I(inode)->rsrc_inode = NULL;
> HFS_I(inode)->fs_blocks = 0;
> @@ -355,8 +355,8 @@ static int hfs_read_inode(struct inode *inode, void *data)
> inode->i_mode |= S_IWUGO;
> inode->i_mode &= ~hsb->s_file_umask;
> inode->i_mode |= S_IFREG;
> - inode->i_ctime = inode->i_atime = inode->i_mtime =
> - hfs_m_to_utime(rec->file.MdDat);
> + inode->i_atime = inode->i_mtime = inode_set_ctime_to_ts(inode,
> + hfs_m_to_utime(rec->file.MdDat));
> inode->i_op = &hfs_file_inode_operations;
> inode->i_fop = &hfs_file_operations;
> inode->i_mapping->a_ops = &hfs_aops;
> @@ -366,8 +366,8 @@ static int hfs_read_inode(struct inode *inode, void *data)
> inode->i_size = be16_to_cpu(rec->dir.Val) + 2;
> HFS_I(inode)->fs_blocks = 0;
> inode->i_mode = S_IFDIR | (S_IRWXUGO & ~hsb->s_dir_umask);
> - inode->i_ctime = inode->i_atime = inode->i_mtime =
> - hfs_m_to_utime(rec->dir.MdDat);
> + inode->i_atime = inode->i_mtime = inode_set_ctime_to_ts(inode,
> + hfs_m_to_utime(rec->dir.MdDat));
> inode->i_op = &hfs_dir_inode_operations;
> inode->i_fop = &hfs_dir_operations;
> break;
> @@ -654,8 +654,7 @@ int hfs_inode_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
>
> truncate_setsize(inode, attr->ia_size);
> hfs_file_truncate(inode);
> - inode->i_atime = inode->i_mtime = inode->i_ctime =
> - current_time(inode);
> + inode->i_atime = inode->i_mtime = inode_set_ctime_current(inode);
> }
>
> setattr_copy(&nop_mnt_idmap, inode, attr);
> diff --git a/fs/hfs/sysdep.c b/fs/hfs/sysdep.c
> index 2875961fdc10..dc27d418fbcd 100644
> --- a/fs/hfs/sysdep.c
> +++ b/fs/hfs/sysdep.c
> @@ -28,7 +28,9 @@ static int hfs_revalidate_dentry(struct dentry *dentry, unsigned int flags)
> /* fix up inode on a timezone change */
> diff = sys_tz.tz_minuteswest * 60 - HFS_I(inode)->tz_secondswest;
> if (diff) {
> - inode->i_ctime.tv_sec += diff;
> + struct timespec64 ctime = inode_get_ctime(inode);
> +
> + inode_set_ctime(inode, ctime.tv_sec + diff, ctime.tv_nsec);
> inode->i_atime.tv_sec += diff;
> inode->i_mtime.tv_sec += diff;
> HFS_I(inode)->tz_secondswest += diff;
> --
> 2.41.0
>
--
Jan Kara <jack@xxxxxxxx>
SUSE Labs, CR
