affs: 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.

Acked-by: David Sterba <dsterba@suse.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Jeff Layton <jlayton@kernel.org>
Message-Id: <20230705190309.579783-21-jlayton@kernel.org>
Signed-off-by: Christian Brauner <brauner@kernel.org>

diff --git a/fs/affs/amigaffs.c b/fs/affs/amigaffs.c
index 29f11e10a7c7d213623063b12b5e98e5bd01a85f..7ba93efc1143e39539f53d0440184fcaba4c6cdf 100644 (file)
--- a/fs/affs/amigaffs.c
+++ b/fs/affs/amigaffs.c
@@ -60,7 +60,7 @@ affs_insert_hash(struct inode *dir, struct buffer_head *bh)
        mark_buffer_dirty_inode(dir_bh, dir);
        affs_brelse(dir_bh);
 
-       dir->i_mtime = dir->i_ctime = current_time(dir);
+       dir->i_mtime = inode_set_ctime_current(dir);
        inode_inc_iversion(dir);
        mark_inode_dirty(dir);
 
@@ -114,7 +114,7 @@ affs_remove_hash(struct inode *dir, struct buffer_head *rem_bh)
 
        affs_brelse(bh);
 
-       dir->i_mtime = dir->i_ctime = current_time(dir);
+       dir->i_mtime = inode_set_ctime_current(dir);
        inode_inc_iversion(dir);
        mark_inode_dirty(dir);
 
@@ -315,7 +315,7 @@ affs_remove_header(struct dentry *dentry)
        else
                clear_nlink(inode);
        affs_unlock_link(inode);
-       inode->i_ctime = current_time(inode);
+       inode_set_ctime_current(inode);
        mark_inode_dirty(inode);
 
 done:

diff --git a/fs/affs/inode.c b/fs/affs/inode.c
index 27f77a52c5c80e4d8d6e33522d50486e31e0feba..060746c63151e7d65b5f683d618ba1c3f956f0fc 100644 (file)
--- a/fs/affs/inode.c
+++ b/fs/affs/inode.c
@@ -149,13 +149,13 @@ struct inode *affs_iget(struct super_block *sb, unsigned long ino)
                break;
        }
 
-       inode->i_mtime.tv_sec = inode->i_atime.tv_sec = inode->i_ctime.tv_sec
-                      = (be32_to_cpu(tail->change.days) * 86400LL +
-                        be32_to_cpu(tail->change.mins) * 60 +
-                        be32_to_cpu(tail->change.ticks) / 50 +
-                        AFFS_EPOCH_DELTA) +
-                        sys_tz.tz_minuteswest * 60;
-       inode->i_mtime.tv_nsec = inode->i_ctime.tv_nsec = inode->i_atime.tv_nsec = 0;
+       inode->i_mtime.tv_sec = inode->i_atime.tv_sec =
+               inode_set_ctime(inode,
+                               (be32_to_cpu(tail->change.days) * 86400LL +
+                                be32_to_cpu(tail->change.mins) * 60 +
+                                be32_to_cpu(tail->change.ticks) / 50 + AFFS_EPOCH_DELTA)
+                               + sys_tz.tz_minuteswest * 60, 0).tv_sec;
+       inode->i_mtime.tv_nsec = inode->i_atime.tv_nsec = 0;
        affs_brelse(bh);
        unlock_new_inode(inode);
        return inode;
@@ -314,7 +314,7 @@ affs_new_inode(struct inode *dir)
        inode->i_gid     = current_fsgid();
        inode->i_ino     = block;
        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);
        atomic_set(&AFFS_I(inode)->i_opencnt, 0);
        AFFS_I(inode)->i_blkcnt = 0;
        AFFS_I(inode)->i_lc = NULL;