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

diff --git a/fs/hfs/catalog.c b/fs/hfs/catalog.c
index 632c226a3972cf6498119cbccc892b12e0c2846b..d63880e7d9d672c7860f79c6fbd416fa905c9752 100644 (file)
--- a/fs/hfs/catalog.c
+++ b/fs/hfs/catalog.c
@@ -133,7 +133,7 @@ int hfs_cat_create(u32 cnid, struct inode *dir, const struct qstr *str, struct i
                goto err1;
 
        dir->i_size++;
-       dir->i_mtime = inode_set_ctime_current(dir);
+       inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir));
        mark_inode_dirty(dir);
        hfs_find_exit(&fd);
        return 0;
@@ -269,7 +269,7 @@ int hfs_cat_delete(u32 cnid, struct inode *dir, const struct qstr *str)
        }
 
        dir->i_size--;
-       dir->i_mtime = inode_set_ctime_current(dir);
+       inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir));
        mark_inode_dirty(dir);
        res = 0;
 out:
@@ -337,7 +337,7 @@ int hfs_cat_move(u32 cnid, struct inode *src_dir, const struct qstr *src_name,
        if (err)
                goto out;
        dst_dir->i_size++;
-       dst_dir->i_mtime = inode_set_ctime_current(dst_dir);
+       inode_set_mtime_to_ts(dst_dir, inode_set_ctime_current(dst_dir));
        mark_inode_dirty(dst_dir);
 
        /* finally remove the old entry */
@@ -349,7 +349,7 @@ int hfs_cat_move(u32 cnid, struct inode *src_dir, const struct qstr *src_name,
        if (err)
                goto out;
        src_dir->i_size--;
-       src_dir->i_mtime = inode_set_ctime_current(src_dir);
+       inode_set_mtime_to_ts(src_dir, inode_set_ctime_current(src_dir));
        mark_inode_dirty(src_dir);
 
        type = entry.type;

diff --git a/fs/hfs/inode.c b/fs/hfs/inode.c
index ee349b72cfb3cd8c2aacc06e067e60aa50e9d4c5..a7bc4690a780daf50e7b16329f0acfe9c21059ed 100644 (file)
--- a/fs/hfs/inode.c
+++ b/fs/hfs/inode.c
@@ -200,7 +200,7 @@ struct inode *hfs_new_inode(struct inode *dir, const struct qstr *name, umode_t
        inode->i_uid = current_fsuid();
        inode->i_gid = current_fsgid();
        set_nlink(inode, 1);
-       inode->i_mtime = inode->i_atime = inode_set_ctime_current(inode);
+       simple_inode_init_ts(inode);
        HFS_I(inode)->flags = 0;
        HFS_I(inode)->rsrc_inode = NULL;
        HFS_I(inode)->fs_blocks = 0;
@@ -355,8 +355,8 @@ static int hfs_read_inode(struct inode *inode, void *data)
                        inode->i_mode |= S_IWUGO;
                inode->i_mode &= ~hsb->s_file_umask;
                inode->i_mode |= S_IFREG;
-               inode->i_atime = inode->i_mtime = inode_set_ctime_to_ts(inode,
-                                                                       hfs_m_to_utime(rec->file.MdDat));
+               inode_set_mtime_to_ts(inode,
+                                     inode_set_atime_to_ts(inode, inode_set_ctime_to_ts(inode, hfs_m_to_utime(rec->file.MdDat))));
                inode->i_op = &hfs_file_inode_operations;
                inode->i_fop = &hfs_file_operations;
                inode->i_mapping->a_ops = &hfs_aops;
@@ -366,8 +366,8 @@ static int hfs_read_inode(struct inode *inode, void *data)
                inode->i_size = be16_to_cpu(rec->dir.Val) + 2;
                HFS_I(inode)->fs_blocks = 0;
                inode->i_mode = S_IFDIR | (S_IRWXUGO & ~hsb->s_dir_umask);
-               inode->i_atime = inode->i_mtime = inode_set_ctime_to_ts(inode,
-                                                                       hfs_m_to_utime(rec->dir.MdDat));
+               inode_set_mtime_to_ts(inode,
+                                     inode_set_atime_to_ts(inode, inode_set_ctime_to_ts(inode, hfs_m_to_utime(rec->dir.MdDat))));
                inode->i_op = &hfs_dir_inode_operations;
                inode->i_fop = &hfs_dir_operations;
                break;
@@ -474,7 +474,7 @@ int hfs_write_inode(struct inode *inode, struct writeback_control *wbc)
                    be32_to_cpu(rec.dir.DirID) != inode->i_ino) {
                }
 
-               rec.dir.MdDat = hfs_u_to_mtime(inode->i_mtime);
+               rec.dir.MdDat = hfs_u_to_mtime(inode_get_mtime(inode));
                rec.dir.Val = cpu_to_be16(inode->i_size - 2);
 
                hfs_bnode_write(fd.bnode, &rec, fd.entryoffset,
@@ -502,7 +502,7 @@ int hfs_write_inode(struct inode *inode, struct writeback_control *wbc)
                else
                        rec.file.Flags |= HFS_FIL_LOCK;
                hfs_inode_write_fork(inode, rec.file.ExtRec, &rec.file.LgLen, &rec.file.PyLen);
-               rec.file.MdDat = hfs_u_to_mtime(inode->i_mtime);
+               rec.file.MdDat = hfs_u_to_mtime(inode_get_mtime(inode));
 
                hfs_bnode_write(fd.bnode, &rec, fd.entryoffset,
                            sizeof(struct hfs_cat_file));
@@ -654,7 +654,7 @@ int hfs_inode_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
 
                truncate_setsize(inode, attr->ia_size);
                hfs_file_truncate(inode);
-               inode->i_atime = inode->i_mtime = inode_set_ctime_current(inode);
+               simple_inode_init_ts(inode);
        }
 
        setattr_copy(&nop_mnt_idmap, inode, attr);

diff --git a/fs/hfs/sysdep.c b/fs/hfs/sysdep.c
index dc27d418fbcdc7d2866cf9e330d4771a098e6e43..76fa02e3835bf07b8329f0c2de9111a0a143a288 100644 (file)
--- a/fs/hfs/sysdep.c
+++ b/fs/hfs/sysdep.c
@@ -28,11 +28,13 @@ static int hfs_revalidate_dentry(struct dentry *dentry, unsigned int flags)
        /* fix up inode on a timezone change */
        diff = sys_tz.tz_minuteswest * 60 - HFS_I(inode)->tz_secondswest;
        if (diff) {
-               struct timespec64 ctime = inode_get_ctime(inode);
+               struct timespec64 ts = inode_get_ctime(inode);
 
-               inode_set_ctime(inode, ctime.tv_sec + diff, ctime.tv_nsec);
-               inode->i_atime.tv_sec += diff;
-               inode->i_mtime.tv_sec += diff;
+               inode_set_ctime(inode, ts.tv_sec + diff, ts.tv_nsec);
+               ts = inode_get_atime(inode);
+               inode_set_atime(inode, ts.tv_sec + diff, ts.tv_nsec);
+               ts = inode_get_mtime(inode);
+               inode_set_mtime(inode, ts.tv_sec + diff, ts.tv_nsec);
                HFS_I(inode)->tz_secondswest += diff;
        }
        return 1;