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

diff --git a/fs/hfsplus/catalog.c b/fs/hfsplus/catalog.c
index e71ae2537eaade4c001fb87efd313a62a7ef88f9..1995bafee839017cd4b86010ed9e671944982ce9 100644 (file)
--- a/fs/hfsplus/catalog.c
+++ b/fs/hfsplus/catalog.c
@@ -312,7 +312,7 @@ int hfsplus_create_cat(u32 cnid, struct inode *dir,
        dir->i_size++;
        if (S_ISDIR(inode->i_mode))
                hfsplus_subfolders_inc(dir);
-       dir->i_mtime = inode_set_ctime_current(dir);
+       inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir));
        hfsplus_mark_inode_dirty(dir, HFSPLUS_I_CAT_DIRTY);
 
        hfs_find_exit(&fd);
@@ -417,7 +417,7 @@ int hfsplus_delete_cat(u32 cnid, struct inode *dir, const struct qstr *str)
        dir->i_size--;
        if (type == HFSPLUS_FOLDER)
                hfsplus_subfolders_dec(dir);
-       dir->i_mtime = inode_set_ctime_current(dir);
+       inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir));
        hfsplus_mark_inode_dirty(dir, HFSPLUS_I_CAT_DIRTY);
 
        if (type == HFSPLUS_FILE || type == HFSPLUS_FOLDER) {
@@ -494,7 +494,7 @@ int hfsplus_rename_cat(u32 cnid,
        dst_dir->i_size++;
        if (type == HFSPLUS_FOLDER)
                hfsplus_subfolders_inc(dst_dir);
-       dst_dir->i_mtime = inode_set_ctime_current(dst_dir);
+       inode_set_mtime_to_ts(dst_dir, inode_set_ctime_current(dst_dir));
 
        /* finally remove the old entry */
        err = hfsplus_cat_build_key(sb, src_fd.search_key,
@@ -511,7 +511,7 @@ int hfsplus_rename_cat(u32 cnid,
        src_dir->i_size--;
        if (type == HFSPLUS_FOLDER)
                hfsplus_subfolders_dec(src_dir);
-       src_dir->i_mtime = inode_set_ctime_current(src_dir);
+       inode_set_mtime_to_ts(src_dir, inode_set_ctime_current(src_dir));
 
        /* remove old thread entry */
        hfsplus_cat_build_key_with_cnid(sb, src_fd.search_key, cnid);

diff --git a/fs/hfsplus/inode.c b/fs/hfsplus/inode.c
index c65c8c4b03dd38bee6866b779ed7be38434cdc54..702a0663b1d8a3d9c1ae7d3fdcf79d61da48ed94 100644 (file)
--- a/fs/hfsplus/inode.c
+++ b/fs/hfsplus/inode.c
@@ -267,7 +267,7 @@ static int hfsplus_setattr(struct mnt_idmap *idmap,
                }
                truncate_setsize(inode, attr->ia_size);
                hfsplus_file_truncate(inode);
-               inode->i_mtime = inode_set_ctime_current(inode);
+               inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode));
        }
 
        setattr_copy(&nop_mnt_idmap, inode, attr);
@@ -392,7 +392,7 @@ struct inode *hfsplus_new_inode(struct super_block *sb, struct inode *dir,
        inode->i_ino = sbi->next_cnid++;
        inode_init_owner(&nop_mnt_idmap, inode, dir, mode);
        set_nlink(inode, 1);
-       inode->i_mtime = inode->i_atime = inode_set_ctime_current(inode);
+       simple_inode_init_ts(inode);
 
        hip = HFSPLUS_I(inode);
        INIT_LIST_HEAD(&hip->open_dir_list);
@@ -521,8 +521,9 @@ int hfsplus_cat_read_inode(struct inode *inode, struct hfs_find_data *fd)
                hfsplus_get_perms(inode, &folder->permissions, 1);
                set_nlink(inode, 1);
                inode->i_size = 2 + be32_to_cpu(folder->valence);
-               inode->i_atime = hfsp_mt2ut(folder->access_date);
-               inode->i_mtime = hfsp_mt2ut(folder->content_mod_date);
+               inode_set_atime_to_ts(inode, hfsp_mt2ut(folder->access_date));
+               inode_set_mtime_to_ts(inode,
+                                     hfsp_mt2ut(folder->content_mod_date));
                inode_set_ctime_to_ts(inode,
                                      hfsp_mt2ut(folder->attribute_mod_date));
                HFSPLUS_I(inode)->create_date = folder->create_date;
@@ -563,8 +564,9 @@ int hfsplus_cat_read_inode(struct inode *inode, struct hfs_find_data *fd)
                        init_special_inode(inode, inode->i_mode,
                                           be32_to_cpu(file->permissions.dev));
                }
-               inode->i_atime = hfsp_mt2ut(file->access_date);
-               inode->i_mtime = hfsp_mt2ut(file->content_mod_date);
+               inode_set_atime_to_ts(inode, hfsp_mt2ut(file->access_date));
+               inode_set_mtime_to_ts(inode,
+                                     hfsp_mt2ut(file->content_mod_date));
                inode_set_ctime_to_ts(inode,
                                      hfsp_mt2ut(file->attribute_mod_date));
                HFSPLUS_I(inode)->create_date = file->create_date;
@@ -609,8 +611,8 @@ int hfsplus_cat_write_inode(struct inode *inode)
                                        sizeof(struct hfsplus_cat_folder));
                /* simple node checks? */
                hfsplus_cat_set_perms(inode, &folder->permissions);
-               folder->access_date = hfsp_ut2mt(inode->i_atime);
-               folder->content_mod_date = hfsp_ut2mt(inode->i_mtime);
+               folder->access_date = hfsp_ut2mt(inode_get_atime(inode));
+               folder->content_mod_date = hfsp_ut2mt(inode_get_mtime(inode));
                folder->attribute_mod_date = hfsp_ut2mt(inode_get_ctime(inode));
                folder->valence = cpu_to_be32(inode->i_size - 2);
                if (folder->flags & cpu_to_be16(HFSPLUS_HAS_FOLDER_COUNT)) {
@@ -644,8 +646,8 @@ int hfsplus_cat_write_inode(struct inode *inode)
                        file->flags |= cpu_to_be16(HFSPLUS_FILE_LOCKED);
                else
                        file->flags &= cpu_to_be16(~HFSPLUS_FILE_LOCKED);
-               file->access_date = hfsp_ut2mt(inode->i_atime);
-               file->content_mod_date = hfsp_ut2mt(inode->i_mtime);
+               file->access_date = hfsp_ut2mt(inode_get_atime(inode));
+               file->content_mod_date = hfsp_ut2mt(inode_get_mtime(inode));
                file->attribute_mod_date = hfsp_ut2mt(inode_get_ctime(inode));
                hfs_bnode_write(fd.bnode, &entry, fd.entryoffset,
                                         sizeof(struct hfsplus_cat_file));