affs: convert to new timestamp accessors

Convert to using the new inode timestamp accessor functions.

Signed-off-by: Jeff Layton <jlayton@kernel.org>
Link: https://lore.kernel.org/r/20231004185347.80880-15-jlayton@kernel.org
Signed-off-by: Christian Brauner <brauner@kernel.org>

diff --git a/fs/affs/amigaffs.c b/fs/affs/amigaffs.c
index 7ba93efc1143e39539f53d0440184fcaba4c6cdf..fd669daa4e7bc951d8d7959c7a5ab1b60b75c61a 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 = inode_set_ctime_current(dir);
+       inode_set_mtime_to_ts(dir, 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 = inode_set_ctime_current(dir);
+       inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir));
        inode_inc_iversion(dir);
        mark_inode_dirty(dir);
 

diff --git a/fs/affs/inode.c b/fs/affs/inode.c
index 060746c63151e7d65b5f683d618ba1c3f956f0fc..0210df8d3500cd46da9d6f0dfd38ec704a1d9e8a 100644 (file)
--- a/fs/affs/inode.c
+++ b/fs/affs/inode.c
@@ -149,13 +149,9 @@ struct inode *affs_iget(struct super_block *sb, unsigned long ino)
                break;
        }
 
-       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;
+       inode_set_mtime(inode,
+                       inode_set_atime(inode, 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, 0).tv_sec,
+                       0);
        affs_brelse(bh);
        unlock_new_inode(inode);
        return inode;
@@ -187,12 +183,13 @@ affs_write_inode(struct inode *inode, struct writeback_control *wbc)
        }
        tail = AFFS_TAIL(sb, bh);
        if (tail->stype == cpu_to_be32(ST_ROOT)) {
-               affs_secs_to_datestamp(inode->i_mtime.tv_sec,
+               affs_secs_to_datestamp(inode_get_mtime_sec(inode),
                                       &AFFS_ROOT_TAIL(sb, bh)->root_change);
        } else {
                tail->protect = cpu_to_be32(AFFS_I(inode)->i_protect);
                tail->size = cpu_to_be32(inode->i_size);
-               affs_secs_to_datestamp(inode->i_mtime.tv_sec, &tail->change);
+               affs_secs_to_datestamp(inode_get_mtime_sec(inode),
+                                      &tail->change);
                if (!(inode->i_ino == AFFS_SB(sb)->s_root_block)) {
                        uid = i_uid_read(inode);
                        gid = i_gid_read(inode);
@@ -314,7 +311,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_set_ctime_current(inode);
+       simple_inode_init_ts(inode);
        atomic_set(&AFFS_I(inode)->i_opencnt, 0);
        AFFS_I(inode)->i_blkcnt = 0;
        AFFS_I(inode)->i_lc = NULL;