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

diff --git a/fs/minix/bitmap.c b/fs/minix/bitmap.c
index 25c08fbfcb9dbafb891aadf659f4c85b299dd1d8..7da66ca184f4211ad98d57107f829d123e9310c3 100644 (file)
--- a/fs/minix/bitmap.c
+++ b/fs/minix/bitmap.c
@@ -251,7 +251,7 @@ struct inode *minix_new_inode(const struct inode *dir, umode_t mode)
        }
        inode_init_owner(&nop_mnt_idmap, inode, dir, mode);
        inode->i_ino = j;
-       inode->i_mtime = inode->i_atime = inode_set_ctime_current(inode);
+       simple_inode_init_ts(inode);
        inode->i_blocks = 0;
        memset(&minix_i(inode)->u, 0, sizeof(minix_i(inode)->u));
        insert_inode_hash(inode);

diff --git a/fs/minix/dir.c b/fs/minix/dir.c
index 20f23e6e58ad44462996fb093a1a0ed7bc1274b7..62c313fc9a4958a2f731c114a353335033a53b5f 100644 (file)
--- a/fs/minix/dir.c
+++ b/fs/minix/dir.c
@@ -281,7 +281,7 @@ got_it:
                de->inode = inode->i_ino;
        }
        dir_commit_chunk(page, pos, sbi->s_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 = minix_handle_dirsync(dir);
 out_put:
@@ -313,7 +313,7 @@ int minix_delete_entry(struct minix_dir_entry *de, struct page *page)
        else
                de->inode = 0;
        dir_commit_chunk(page, pos, len);
-       inode->i_mtime = inode_set_ctime_current(inode);
+       inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode));
        mark_inode_dirty(inode);
        return minix_handle_dirsync(inode);
 }
@@ -436,7 +436,7 @@ int minix_set_link(struct minix_dir_entry *de, struct page *page,
        else
                de->inode = inode->i_ino;
        dir_commit_chunk(page, pos, sbi->s_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 minix_handle_dirsync(dir);
 }

diff --git a/fs/minix/inode.c b/fs/minix/inode.c
index df575473c1cc0b0ba975e37396634838b6a48c74..f8af6c3ae336aa41faff1f805a38f7e60673aede 100644 (file)
--- a/fs/minix/inode.c
+++ b/fs/minix/inode.c
@@ -501,7 +501,8 @@ static struct inode *V1_minix_iget(struct inode *inode)
        i_gid_write(inode, raw_inode->i_gid);
        set_nlink(inode, raw_inode->i_nlinks);
        inode->i_size = raw_inode->i_size;
-       inode->i_mtime = inode->i_atime = inode_set_ctime(inode, raw_inode->i_time, 0);
+       inode_set_mtime_to_ts(inode,
+                             inode_set_atime_to_ts(inode, inode_set_ctime(inode, raw_inode->i_time, 0)));
        inode->i_blocks = 0;
        for (i = 0; i < 9; i++)
                minix_inode->u.i1_data[i] = raw_inode->i_zone[i];
@@ -538,11 +539,9 @@ static struct inode *V2_minix_iget(struct inode *inode)
        i_gid_write(inode, raw_inode->i_gid);
        set_nlink(inode, raw_inode->i_nlinks);
        inode->i_size = raw_inode->i_size;
-       inode->i_mtime.tv_sec = raw_inode->i_mtime;
-       inode->i_atime.tv_sec = raw_inode->i_atime;
+       inode_set_mtime(inode, raw_inode->i_mtime, 0);
+       inode_set_atime(inode, raw_inode->i_atime, 0);
        inode_set_ctime(inode, raw_inode->i_ctime, 0);
-       inode->i_mtime.tv_nsec = 0;
-       inode->i_atime.tv_nsec = 0;
        inode->i_blocks = 0;
        for (i = 0; i < 10; i++)
                minix_inode->u.i2_data[i] = raw_inode->i_zone[i];
@@ -589,7 +588,7 @@ static struct buffer_head * V1_minix_update_inode(struct inode * inode)
        raw_inode->i_gid = fs_high2lowgid(i_gid_read(inode));
        raw_inode->i_nlinks = inode->i_nlink;
        raw_inode->i_size = inode->i_size;
-       raw_inode->i_time = inode->i_mtime.tv_sec;
+       raw_inode->i_time = inode_get_mtime_sec(inode);
        if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode))
                raw_inode->i_zone[0] = old_encode_dev(inode->i_rdev);
        else for (i = 0; i < 9; i++)
@@ -616,9 +615,9 @@ static struct buffer_head * V2_minix_update_inode(struct inode * inode)
        raw_inode->i_gid = fs_high2lowgid(i_gid_read(inode));
        raw_inode->i_nlinks = inode->i_nlink;
        raw_inode->i_size = inode->i_size;
-       raw_inode->i_mtime = inode->i_mtime.tv_sec;
-       raw_inode->i_atime = inode->i_atime.tv_sec;
-       raw_inode->i_ctime = inode_get_ctime(inode).tv_sec;
+       raw_inode->i_mtime = inode_get_mtime_sec(inode);
+       raw_inode->i_atime = inode_get_atime_sec(inode);
+       raw_inode->i_ctime = inode_get_ctime_sec(inode);
        if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode))
                raw_inode->i_zone[0] = old_encode_dev(inode->i_rdev);
        else for (i = 0; i < 10; i++)

diff --git a/fs/minix/itree_common.c b/fs/minix/itree_common.c
index ce18ae37c29d85b19879e0ebc1e2fff413baaaee..dad131e30c0590a4b1d7dfe338dad896a1f0b340 100644 (file)
--- a/fs/minix/itree_common.c
+++ b/fs/minix/itree_common.c
@@ -350,7 +350,7 @@ do_indirects:
                }
                first_whole++;
        }
-       inode->i_mtime = inode_set_ctime_current(inode);
+       inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode));
        mark_inode_dirty(inode);
 }