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

diff --git a/fs/isofs/inode.c b/fs/isofs/inode.c
index 2ee21286ac8f07c7cab2a7e6c1d92ae518b21081..3e4d53e26f947781f8a3a04f63d957e6cd8f52b1 100644 (file)
--- a/fs/isofs/inode.c
+++ b/fs/isofs/inode.c
@@ -1422,8 +1422,8 @@ static int isofs_read_inode(struct inode *inode, int relocated)
                        inode->i_ino, de->flags[-high_sierra]);
        }
 #endif
-       inode->i_mtime = inode->i_atime =
-               inode_set_ctime(inode, iso_date(de->date, high_sierra), 0);
+       inode_set_mtime_to_ts(inode,
+                             inode_set_atime_to_ts(inode, inode_set_ctime(inode, iso_date(de->date, high_sierra), 0)));
 
        ei->i_first_extent = (isonum_733(de->extent) +
                        isonum_711(de->ext_attr_length));

diff --git a/fs/isofs/rock.c b/fs/isofs/rock.c
index 348783a70f5715ace252149deadb30a50e4e562e..d6c17ad69dee570cf9d756123d64158d70427165 100644 (file)
--- a/fs/isofs/rock.c
+++ b/fs/isofs/rock.c
@@ -426,16 +426,14 @@ repeat:
                                                0);
                        }
                        if (rr->u.TF.flags & TF_MODIFY) {
-                               inode->i_mtime.tv_sec =
-                                   iso_date(rr->u.TF.times[cnt++].time,
-                                            0);
-                               inode->i_mtime.tv_nsec = 0;
+                               inode_set_mtime(inode,
+                                               iso_date(rr->u.TF.times[cnt++].time, 0),
+                                               0);
                        }
                        if (rr->u.TF.flags & TF_ACCESS) {
-                               inode->i_atime.tv_sec =
-                                   iso_date(rr->u.TF.times[cnt++].time,
-                                            0);
-                               inode->i_atime.tv_nsec = 0;
+                               inode_set_atime(inode,
+                                               iso_date(rr->u.TF.times[cnt++].time, 0),
+                                               0);
                        }
                        if (rr->u.TF.flags & TF_ATTRIBUTES) {
                                inode_set_ctime(inode,
@@ -531,9 +529,9 @@ repeat:
                        inode->i_rdev = reloc->i_rdev;
                        inode->i_size = reloc->i_size;
                        inode->i_blocks = reloc->i_blocks;
-                       inode->i_atime = reloc->i_atime;
+                       inode_set_atime_to_ts(inode, inode_get_atime(reloc));
                        inode_set_ctime_to_ts(inode, inode_get_ctime(reloc));
-                       inode->i_mtime = reloc->i_mtime;
+                       inode_set_mtime_to_ts(inode, inode_get_mtime(reloc));
                        iput(reloc);
                        break;
 #ifdef CONFIG_ZISOFS