sysv: 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-69-jlayton@kernel.org
Signed-off-by: Christian Brauner <brauner@kernel.org>

diff --git a/fs/sysv/dir.c b/fs/sysv/dir.c
index 2f5ead8..2e126d7 100644 (file)
--- a/fs/sysv/dir.c
+++ b/fs/sysv/dir.c
@@ -224,7 +224,7 @@ got_it:
        memset (de->name + namelen, 0, SYSV_DIRSIZE - namelen - 2);
        de->inode = cpu_to_fs16(SYSV_SB(inode->i_sb), inode->i_ino);
        dir_commit_chunk(page, pos, SYSV_DIRSIZE);
-       dir->i_mtime = inode_set_ctime_current(dir);
+       inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir));
        mark_inode_dirty(dir);
        err = sysv_handle_dirsync(dir);
 out_page:
@@ -249,7 +249,7 @@ int sysv_delete_entry(struct sysv_dir_entry *de, struct page *page)
        }
        de->inode = 0;
        dir_commit_chunk(page, pos, SYSV_DIRSIZE);
-       inode->i_mtime = inode_set_ctime_current(inode);
+       inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode));
        mark_inode_dirty(inode);
        return sysv_handle_dirsync(inode);
 }
@@ -346,7 +346,7 @@ int sysv_set_link(struct sysv_dir_entry *de, struct page *page,
        }
        de->inode = cpu_to_fs16(SYSV_SB(inode->i_sb), inode->i_ino);
        dir_commit_chunk(page, pos, SYSV_DIRSIZE);
-       dir->i_mtime = inode_set_ctime_current(dir);
+       inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir));
        mark_inode_dirty(dir);
        return sysv_handle_dirsync(inode);
 }

diff --git a/fs/sysv/ialloc.c b/fs/sysv/ialloc.c
index 6719da5..269df6d 100644 (file)
--- a/fs/sysv/ialloc.c
+++ b/fs/sysv/ialloc.c
@@ -165,7 +165,7 @@ struct inode * sysv_new_inode(const struct inode * dir, umode_t mode)
        dirty_sb(sb);
        inode_init_owner(&nop_mnt_idmap, inode, dir, mode);
        inode->i_ino = fs16_to_cpu(sbi, ino);
-       inode->i_mtime = inode->i_atime = inode_set_ctime_current(inode);
+       simple_inode_init_ts(inode);
        inode->i_blocks = 0;
        memset(SYSV_I(inode)->i_data, 0, sizeof(SYSV_I(inode)->i_data));
        SYSV_I(inode)->i_dir_start_lookup = 0;

diff --git a/fs/sysv/inode.c b/fs/sysv/inode.c
index 0aa3827..5a915b2 100644 (file)
--- a/fs/sysv/inode.c
+++ b/fs/sysv/inode.c
@@ -200,11 +200,9 @@ struct inode *sysv_iget(struct super_block *sb, unsigned int ino)
        i_gid_write(inode, (gid_t)fs16_to_cpu(sbi, raw_inode->i_gid));
        set_nlink(inode, fs16_to_cpu(sbi, raw_inode->i_nlink));
        inode->i_size = fs32_to_cpu(sbi, raw_inode->i_size);
-       inode->i_atime.tv_sec = fs32_to_cpu(sbi, raw_inode->i_atime);
-       inode->i_mtime.tv_sec = fs32_to_cpu(sbi, raw_inode->i_mtime);
+       inode_set_atime(inode, fs32_to_cpu(sbi, raw_inode->i_atime), 0);
+       inode_set_mtime(inode, fs32_to_cpu(sbi, raw_inode->i_mtime), 0);
        inode_set_ctime(inode, fs32_to_cpu(sbi, raw_inode->i_ctime), 0);
-       inode->i_atime.tv_nsec = 0;
-       inode->i_mtime.tv_nsec = 0;
        inode->i_blocks = 0;
 
        si = SYSV_I(inode);
@@ -253,9 +251,9 @@ static int __sysv_write_inode(struct inode *inode, int wait)
        raw_inode->i_gid = cpu_to_fs16(sbi, fs_high2lowgid(i_gid_read(inode)));
        raw_inode->i_nlink = cpu_to_fs16(sbi, inode->i_nlink);
        raw_inode->i_size = cpu_to_fs32(sbi, inode->i_size);
-       raw_inode->i_atime = cpu_to_fs32(sbi, inode->i_atime.tv_sec);
-       raw_inode->i_mtime = cpu_to_fs32(sbi, inode->i_mtime.tv_sec);
-       raw_inode->i_ctime = cpu_to_fs32(sbi, inode_get_ctime(inode).tv_sec);
+       raw_inode->i_atime = cpu_to_fs32(sbi, inode_get_atime_sec(inode));
+       raw_inode->i_mtime = cpu_to_fs32(sbi, inode_get_mtime_sec(inode));
+       raw_inode->i_ctime = cpu_to_fs32(sbi, inode_get_ctime_sec(inode));
 
        si = SYSV_I(inode);
        if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode))

diff --git a/fs/sysv/itree.c b/fs/sysv/itree.c
index edb94e5..7259814 100644 (file)
--- a/fs/sysv/itree.c
+++ b/fs/sysv/itree.c
@@ -423,7 +423,7 @@ do_indirects:
                }
                n++;
        }
-       inode->i_mtime = inode_set_ctime_current(inode);
+       inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode));
        if (IS_SYNC(inode))
                sysv_sync_inode (inode);
        else