fs: convert to ctime accessor functions

In later patches, we're going to change how the inode's ctime field is
used. Switch to using accessor functions instead of raw accesses of
inode->i_ctime.

Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Jeff Layton <jlayton@kernel.org>
Message-Id: <20230705190309.579783-23-jlayton@kernel.org>
Signed-off-by: Christian Brauner <brauner@kernel.org>

diff --git a/fs/attr.c b/fs/attr.c
index d60dc1edb526885584bf62b74da1542e271a8f7d..599f6d14c0ed0bece6ee3381ec98a5489b1aca21 100644 (file)
--- a/fs/attr.c
+++ b/fs/attr.c
@@ -312,7 +312,7 @@ void setattr_copy(struct mnt_idmap *idmap, struct inode *inode,
        if (ia_valid & ATTR_MTIME)
                inode->i_mtime = attr->ia_mtime;
        if (ia_valid & ATTR_CTIME)
-               inode->i_ctime = attr->ia_ctime;
+               inode_set_ctime_to_ts(inode, attr->ia_ctime);
        if (ia_valid & ATTR_MODE) {
                umode_t mode = attr->ia_mode;
                if (!in_group_or_capable(idmap, inode,

diff --git a/fs/bad_inode.c b/fs/bad_inode.c
index db649487d58c4a704049846470428f79e8099523..6e21f7412a85f1e60eab8dfb12ae2cfcd773f3c2 100644 (file)
--- a/fs/bad_inode.c
+++ b/fs/bad_inode.c
@@ -209,8 +209,7 @@ void make_bad_inode(struct inode *inode)
        remove_inode_hash(inode);
 
        inode->i_mode = S_IFREG;
-       inode->i_atime = inode->i_mtime = inode->i_ctime =
-               current_time(inode);
+       inode->i_atime = inode->i_mtime = inode_set_ctime_current(inode);
        inode->i_op = &bad_inode_ops;   
        inode->i_opflags &= ~IOP_XATTR;
        inode->i_fop = &bad_file_ops;   

diff --git a/fs/binfmt_misc.c b/fs/binfmt_misc.c
index bb202ad369d534859843a01c34d87733b8482467..e0108d17b085cfa6d326ff8908d196351a64e576 100644 (file)
--- a/fs/binfmt_misc.c
+++ b/fs/binfmt_misc.c
@@ -547,8 +547,7 @@ static struct inode *bm_get_inode(struct super_block *sb, int mode)
        if (inode) {
                inode->i_ino = get_next_ino();
                inode->i_mode = mode;
-               inode->i_atime = inode->i_mtime = inode->i_ctime =
-                       current_time(inode);
+               inode->i_atime = inode->i_mtime = inode_set_ctime_current(inode);
        }
        return inode;
 }

diff --git a/fs/inode.c b/fs/inode.c
index aac5cdcf5e89f3de7f529236d146dad2afcacb33..d4ab92233062ecdceb75c3a9d4eba0536b1995cf 100644 (file)
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -1853,6 +1853,7 @@ EXPORT_SYMBOL(bmap);
 static int relatime_need_update(struct vfsmount *mnt, struct inode *inode,
                             struct timespec64 now)
 {
+       struct timespec64 ctime;
 
        if (!(mnt->mnt_flags & MNT_RELATIME))
                return 1;
@@ -1864,7 +1865,8 @@ static int relatime_need_update(struct vfsmount *mnt, struct inode *inode,
        /*
         * Is ctime younger than or equal to atime? If yes, update atime:
         */
-       if (timespec64_compare(&inode->i_ctime, &inode->i_atime) >= 0)
+       ctime = inode_get_ctime(inode);
+       if (timespec64_compare(&ctime, &inode->i_atime) >= 0)
                return 1;
 
        /*
@@ -1887,7 +1889,7 @@ int generic_update_time(struct inode *inode, struct timespec64 *time, int flags)
                if (flags & S_ATIME)
                        inode->i_atime = *time;
                if (flags & S_CTIME)
-                       inode->i_ctime = *time;
+                       inode_set_ctime_to_ts(inode, *time);
                if (flags & S_MTIME)
                        inode->i_mtime = *time;
 
@@ -2073,6 +2075,7 @@ EXPORT_SYMBOL(file_remove_privs);
 static int inode_needs_update_time(struct inode *inode, struct timespec64 *now)
 {
        int sync_it = 0;
+       struct timespec64 ctime;
 
        /* First try to exhaust all avenues to not sync */
        if (IS_NOCMTIME(inode))
@@ -2081,7 +2084,8 @@ static int inode_needs_update_time(struct inode *inode, struct timespec64 *now)
        if (!timespec64_equal(&inode->i_mtime, now))
                sync_it = S_MTIME;
 
-       if (!timespec64_equal(&inode->i_ctime, now))
+       ctime = inode_get_ctime(inode);
+       if (!timespec64_equal(&ctime, now))
                sync_it |= S_CTIME;
 
        if (IS_I_VERSION(inode) && inode_iversion_need_inc(inode))

diff --git a/fs/nsfs.c b/fs/nsfs.c
index f602a96a1afec392fa8e2b31ff8f4d9c8f532284..647a22433bd8a9ef4d0b0151e880464c9e6b9531 100644 (file)
--- a/fs/nsfs.c
+++ b/fs/nsfs.c
@@ -84,7 +84,7 @@ slow:
                return -ENOMEM;
        }
        inode->i_ino = ns->inum;
-       inode->i_mtime = inode->i_atime = inode->i_ctime = current_time(inode);
+       inode->i_mtime = inode->i_atime = inode_set_ctime_current(inode);
        inode->i_flags |= S_IMMUTABLE;
        inode->i_mode = S_IFREG | S_IRUGO;
        inode->i_fop = &ns_file_operations;

diff --git a/fs/pipe.c b/fs/pipe.c
index 2d88f73f585a21aaf5a5fa20df08e269bcec3909..1746821036698ca6dd781c8565a34c7234c7d33c 100644 (file)
--- a/fs/pipe.c
+++ b/fs/pipe.c
@@ -899,7 +899,7 @@ static struct inode * get_pipe_inode(void)
        inode->i_mode = S_IFIFO | S_IRUSR | S_IWUSR;
        inode->i_uid = current_fsuid();
        inode->i_gid = current_fsgid();
-       inode->i_atime = inode->i_mtime = inode->i_ctime = current_time(inode);
+       inode->i_atime = inode->i_mtime = inode_set_ctime_current(inode);
 
        return inode;
 

diff --git a/fs/posix_acl.c b/fs/posix_acl.c
index 7fa1b738bbab07cf93453bfd4e4f52d62bb09ebe..a05fe94970ce7872c4b155e3ab3102c5712006fc 100644 (file)
--- a/fs/posix_acl.c
+++ b/fs/posix_acl.c
@@ -1027,7 +1027,7 @@ int simple_set_acl(struct mnt_idmap *idmap, struct dentry *dentry,
                        return error;
        }
 
-       inode->i_ctime = current_time(inode);
+       inode_set_ctime_current(inode);
        if (IS_I_VERSION(inode))
                inode_inc_iversion(inode);
        set_cached_acl(inode, type, acl);

diff --git a/fs/stack.c b/fs/stack.c
index c9830924eb125b7671c702c4625270d6b83dad13..b5e01bdb5f5fd5a1be424d8c5f6bf3a0ce028eac 100644 (file)
--- a/fs/stack.c
+++ b/fs/stack.c
@@ -68,7 +68,7 @@ void fsstack_copy_attr_all(struct inode *dest, const struct inode *src)
        dest->i_rdev = src->i_rdev;
        dest->i_atime = src->i_atime;
        dest->i_mtime = src->i_mtime;
-       dest->i_ctime = src->i_ctime;
+       inode_set_ctime_to_ts(dest, inode_get_ctime(src));
        dest->i_blkbits = src->i_blkbits;
        dest->i_flags = src->i_flags;
        set_nlink(dest, src->i_nlink);

diff --git a/fs/stat.c b/fs/stat.c
index 7c238da22ef0c639a50a3fd933ae342cb6eb9060..8c2b30af19f566278c71c6bcb2c112ac3bff4ff9 100644 (file)
--- a/fs/stat.c
+++ b/fs/stat.c
@@ -58,7 +58,7 @@ void generic_fillattr(struct mnt_idmap *idmap, struct inode *inode,
        stat->size = i_size_read(inode);
        stat->atime = inode->i_atime;
        stat->mtime = inode->i_mtime;
-       stat->ctime = inode->i_ctime;
+       stat->ctime = inode_get_ctime(inode);
        stat->blksize = i_blocksize(inode);
        stat->blocks = inode->i_blocks;
 }