On Wed 05-07-23 15:00:53, 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/bfs/dir.c | 16 ++++++++--------
> fs/bfs/inode.c | 5 ++---
> 2 files changed, 10 insertions(+), 11 deletions(-)
>
> diff --git a/fs/bfs/dir.c b/fs/bfs/dir.c
> index d2e8a2a56b05..12b8af04dcb3 100644
> --- a/fs/bfs/dir.c
> +++ b/fs/bfs/dir.c
> @@ -97,7 +97,7 @@ static int bfs_create(struct mnt_idmap *idmap, struct inode *dir,
> set_bit(ino, info->si_imap);
> info->si_freei--;
> inode_init_owner(&nop_mnt_idmap, inode, dir, mode);
> - inode->i_mtime = inode->i_atime = inode->i_ctime = current_time(inode);
> + inode->i_mtime = inode->i_atime = inode_set_ctime_current(inode);
> inode->i_blocks = 0;
> inode->i_op = &bfs_file_inops;
> inode->i_fop = &bfs_file_operations;
> @@ -158,7 +158,7 @@ static int bfs_link(struct dentry *old, struct inode *dir,
> return err;
> }
> inc_nlink(inode);
> - inode->i_ctime = current_time(inode);
> + inode_set_ctime_current(inode);
> mark_inode_dirty(inode);
> ihold(inode);
> d_instantiate(new, inode);
> @@ -187,9 +187,9 @@ static int bfs_unlink(struct inode *dir, struct dentry *dentry)
> }
> de->ino = 0;
> mark_buffer_dirty_inode(bh, dir);
> - dir->i_ctime = dir->i_mtime = current_time(dir);
> + dir->i_mtime = inode_set_ctime_current(dir);
> mark_inode_dirty(dir);
> - inode->i_ctime = dir->i_ctime;
> + inode_set_ctime_to_ts(inode, inode_get_ctime(dir));
> inode_dec_link_count(inode);
> error = 0;
>
> @@ -240,10 +240,10 @@ static int bfs_rename(struct mnt_idmap *idmap, struct inode *old_dir,
> goto end_rename;
> }
> old_de->ino = 0;
> - old_dir->i_ctime = old_dir->i_mtime = current_time(old_dir);
> + old_dir->i_mtime = inode_set_ctime_current(old_dir);
> mark_inode_dirty(old_dir);
> if (new_inode) {
> - new_inode->i_ctime = current_time(new_inode);
> + inode_set_ctime_current(new_inode);
> inode_dec_link_count(new_inode);
> }
> mark_buffer_dirty_inode(old_bh, old_dir);
> @@ -292,9 +292,9 @@ static int bfs_add_entry(struct inode *dir, const struct qstr *child, int ino)
> pos = (block - sblock) * BFS_BSIZE + off;
> if (pos >= dir->i_size) {
> dir->i_size += BFS_DIRENT_SIZE;
> - dir->i_ctime = current_time(dir);
> + inode_set_ctime_current(dir);
> }
> - dir->i_mtime = dir->i_ctime = current_time(dir);
> + dir->i_mtime = inode_set_ctime_current(dir);
> mark_inode_dirty(dir);
> de->ino = cpu_to_le16((u16)ino);
> for (i = 0; i < BFS_NAMELEN; i++)
> diff --git a/fs/bfs/inode.c b/fs/bfs/inode.c
> index 1926bec2c850..e6a76ae9eb44 100644
> --- a/fs/bfs/inode.c
> +++ b/fs/bfs/inode.c
> @@ -82,10 +82,9 @@ struct inode *bfs_iget(struct super_block *sb, unsigned long ino)
> inode->i_blocks = BFS_FILEBLOCKS(di);
> inode->i_atime.tv_sec = le32_to_cpu(di->i_atime);
> inode->i_mtime.tv_sec = le32_to_cpu(di->i_mtime);
> - inode->i_ctime.tv_sec = le32_to_cpu(di->i_ctime);
> + inode_set_ctime(inode, le32_to_cpu(di->i_ctime), 0);
> inode->i_atime.tv_nsec = 0;
> inode->i_mtime.tv_nsec = 0;
> - inode->i_ctime.tv_nsec = 0;
>
> brelse(bh);
> unlock_new_inode(inode);
> @@ -143,7 +142,7 @@ static int bfs_write_inode(struct inode *inode, struct writeback_control *wbc)
> di->i_nlink = cpu_to_le32(inode->i_nlink);
> di->i_atime = cpu_to_le32(inode->i_atime.tv_sec);
> di->i_mtime = cpu_to_le32(inode->i_mtime.tv_sec);
> - di->i_ctime = cpu_to_le32(inode->i_ctime.tv_sec);
> + di->i_ctime = cpu_to_le32(inode_get_ctime(inode).tv_sec);
> i_sblock = BFS_I(inode)->i_sblock;
> di->i_sblock = cpu_to_le32(i_sblock);
> di->i_eblock = cpu_to_le32(BFS_I(inode)->i_eblock);
> --
> 2.41.0
>
--
Jan Kara <jack@xxxxxxxx>
SUSE Labs, CR
