Merge tag 'lkmm.2023.10.28a' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck...

[linux-block.git] / fs / sysv / inode.c

diff --git a/fs/sysv/inode.c b/fs/sysv/inode.c
index 0aa3827d81786ff603baeb24bb1205209e01f1c9..5a915b2e68f5e48769bab76b315913303014d8b4 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))