omfs: convert to new timestamp accessors
authorJeff Layton <jlayton@kernel.org>
Wed, 4 Oct 2023 18:52:42 +0000 (14:52 -0400)
committerChristian Brauner <brauner@kernel.org>
Wed, 18 Oct 2023 12:08:25 +0000 (14:08 +0200)
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-55-jlayton@kernel.org
Signed-off-by: Christian Brauner <brauner@kernel.org>
fs/omfs/inode.c

index 2f8c1882f45c8505add7d94da6f11c5640a7e3cb..d6cd81163030972deff938e2db8401ae2facf0ab 100644 (file)
@@ -51,7 +51,7 @@ struct inode *omfs_new_inode(struct inode *dir, umode_t mode)
        inode_init_owner(&nop_mnt_idmap, inode, NULL, mode);
        inode->i_mapping->a_ops = &omfs_aops;
 
-       inode->i_atime = inode->i_mtime = inode_set_ctime_current(inode);
+       simple_inode_init_ts(inode);
        switch (mode & S_IFMT) {
        case S_IFDIR:
                inode->i_op = &omfs_dir_inops;
@@ -134,8 +134,8 @@ static int __omfs_write_inode(struct inode *inode, int wait)
        oi->i_head.h_magic = OMFS_IMAGIC;
        oi->i_size = cpu_to_be64(inode->i_size);
 
-       ctime = inode_get_ctime(inode).tv_sec * 1000LL +
-               ((inode_get_ctime(inode).tv_nsec + 999)/1000);
+       ctime = inode_get_ctime_sec(inode) * 1000LL +
+               ((inode_get_ctime_nsec(inode) + 999)/1000);
        oi->i_ctime = cpu_to_be64(ctime);
 
        omfs_update_checksums(oi);
@@ -230,11 +230,9 @@ struct inode *omfs_iget(struct super_block *sb, ino_t ino)
        ctime = be64_to_cpu(oi->i_ctime);
        nsecs = do_div(ctime, 1000) * 1000L;
 
-       inode->i_atime.tv_sec = ctime;
-       inode->i_mtime.tv_sec = ctime;
+       inode_set_atime(inode, ctime, nsecs);
+       inode_set_mtime(inode, ctime, nsecs);
        inode_set_ctime(inode, ctime, nsecs);
-       inode->i_atime.tv_nsec = nsecs;
-       inode->i_mtime.tv_nsec = nsecs;
 
        inode->i_mapping->a_ops = &omfs_aops;