]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
fs: convert core infrastructure to new timestamp accessors
authorJeff Layton <jlayton@kernel.org>
Wed, 4 Oct 2023 18:52:38 +0000 (14:52 -0400)
committerChristian Brauner <brauner@kernel.org>
Wed, 18 Oct 2023 11:26:15 +0000 (13:26 +0200)
Convert the core vfs code to use the new timestamp accessor functions.

Signed-off-by: Jeff Layton <jlayton@kernel.org>
Link: https://lore.kernel.org/r/20231004185239.80830-2-jlayton@kernel.org
Signed-off-by: Christian Brauner <brauner@kernel.org>
fs/attr.c
fs/bad_inode.c
fs/binfmt_misc.c
fs/inode.c
fs/nsfs.c
fs/pipe.c
fs/stack.c
fs/stat.c

index a8ae5f6d9b16786dec162bcdd7150b3203863769..bdf5deb06ea97de76a52323eb7c0d46e280b1415 100644 (file)
--- a/fs/attr.c
+++ b/fs/attr.c
@@ -308,9 +308,9 @@ void setattr_copy(struct mnt_idmap *idmap, struct inode *inode,
        i_uid_update(idmap, attr, inode);
        i_gid_update(idmap, attr, inode);
        if (ia_valid & ATTR_ATIME)
-               inode->i_atime = attr->ia_atime;
+               inode_set_atime_to_ts(inode, attr->ia_atime);
        if (ia_valid & ATTR_MTIME)
-               inode->i_mtime = attr->ia_mtime;
+               inode_set_mtime_to_ts(inode, attr->ia_mtime);
        if (ia_valid & ATTR_CTIME)
                inode_set_ctime_to_ts(inode, attr->ia_ctime);
        if (ia_valid & ATTR_MODE) {
index 83f9566c973b7edb9cecc9f4f30118a85cfa9c7b..316d88da2ce107df3a46de2962ad91a282ca1c76 100644 (file)
@@ -208,7 +208,7 @@ void make_bad_inode(struct inode *inode)
        remove_inode_hash(inode);
 
        inode->i_mode = S_IFREG;
-       inode->i_atime = inode->i_mtime = inode_set_ctime_current(inode);
+       simple_inode_init_ts(inode);
        inode->i_op = &bad_inode_ops;   
        inode->i_opflags &= ~IOP_XATTR;
        inode->i_fop = &bad_file_ops;   
index e0108d17b085cfa6d326ff8908d196351a64e576..5d2be9b0a0a597c8ea027ba2d8d6fcb4ea41f1fa 100644 (file)
@@ -547,7 +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_set_ctime_current(inode);
+               simple_inode_init_ts(inode);
        }
        return inode;
 }
index 84bc3c76e5ccb5d800172dfe76be3d3d80ecc2ff..0612ad9c0227820d9a5768c0f3dc62a20144f43d 100644 (file)
@@ -1837,27 +1837,29 @@ EXPORT_SYMBOL(bmap);
 static int relatime_need_update(struct vfsmount *mnt, struct inode *inode,
                             struct timespec64 now)
 {
-       struct timespec64 ctime;
+       struct timespec64 atime, mtime, ctime;
 
        if (!(mnt->mnt_flags & MNT_RELATIME))
                return 1;
        /*
         * Is mtime younger than or equal to atime? If yes, update atime:
         */
-       if (timespec64_compare(&inode->i_mtime, &inode->i_atime) >= 0)
+       atime = inode_get_atime(inode);
+       mtime = inode_get_mtime(inode);
+       if (timespec64_compare(&mtime, &atime) >= 0)
                return 1;
        /*
         * Is ctime younger than or equal to atime? If yes, update atime:
         */
        ctime = inode_get_ctime(inode);
-       if (timespec64_compare(&ctime, &inode->i_atime) >= 0)
+       if (timespec64_compare(&ctime, &atime) >= 0)
                return 1;
 
        /*
         * Is the previous atime value older than a day? If yes,
         * update atime:
         */
-       if ((long)(now.tv_sec - inode->i_atime.tv_sec) >= 24*60*60)
+       if ((long)(now.tv_sec - atime.tv_sec) >= 24*60*60)
                return 1;
        /*
         * Good, we can skip the atime update:
@@ -1888,12 +1890,13 @@ int inode_update_timestamps(struct inode *inode, int flags)
 
        if (flags & (S_MTIME|S_CTIME|S_VERSION)) {
                struct timespec64 ctime = inode_get_ctime(inode);
+               struct timespec64 mtime = inode_get_mtime(inode);
 
                now = inode_set_ctime_current(inode);
                if (!timespec64_equal(&now, &ctime))
                        updated |= S_CTIME;
-               if (!timespec64_equal(&now, &inode->i_mtime)) {
-                       inode->i_mtime = now;
+               if (!timespec64_equal(&now, &mtime)) {
+                       inode_set_mtime_to_ts(inode, now);
                        updated |= S_MTIME;
                }
                if (IS_I_VERSION(inode) && inode_maybe_inc_iversion(inode, updated))
@@ -1903,8 +1906,10 @@ int inode_update_timestamps(struct inode *inode, int flags)
        }
 
        if (flags & S_ATIME) {
-               if (!timespec64_equal(&now, &inode->i_atime)) {
-                       inode->i_atime = now;
+               struct timespec64 atime = inode_get_atime(inode);
+
+               if (!timespec64_equal(&now, &atime)) {
+                       inode_set_atime_to_ts(inode, now);
                        updated |= S_ATIME;
                }
        }
@@ -1963,7 +1968,7 @@ EXPORT_SYMBOL(inode_update_time);
 bool atime_needs_update(const struct path *path, struct inode *inode)
 {
        struct vfsmount *mnt = path->mnt;
-       struct timespec64 now;
+       struct timespec64 now, atime;
 
        if (inode->i_flags & S_NOATIME)
                return false;
@@ -1989,7 +1994,8 @@ bool atime_needs_update(const struct path *path, struct inode *inode)
        if (!relatime_need_update(mnt, inode, now))
                return false;
 
-       if (timespec64_equal(&inode->i_atime, &now))
+       atime = inode_get_atime(inode);
+       if (timespec64_equal(&atime, &now))
                return false;
 
        return true;
@@ -2106,17 +2112,18 @@ static int inode_needs_update_time(struct inode *inode)
 {
        int sync_it = 0;
        struct timespec64 now = current_time(inode);
-       struct timespec64 ctime;
+       struct timespec64 ts;
 
        /* First try to exhaust all avenues to not sync */
        if (IS_NOCMTIME(inode))
                return 0;
 
-       if (!timespec64_equal(&inode->i_mtime, &now))
+       ts = inode_get_mtime(inode);
+       if (!timespec64_equal(&ts, &now))
                sync_it = S_MTIME;
 
-       ctime = inode_get_ctime(inode);
-       if (!timespec64_equal(&ctime, &now))
+       ts = inode_get_ctime(inode);
+       if (!timespec64_equal(&ts, &now))
                sync_it |= S_CTIME;
 
        if (IS_I_VERSION(inode) && inode_iversion_need_inc(inode))
index 647a22433bd8a9ef4d0b0151e880464c9e6b9531..9a4b228d42fa8c27b61efe34464084c579c5bc71 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_set_ctime_current(inode);
+       simple_inode_init_ts(inode);
        inode->i_flags |= S_IMMUTABLE;
        inode->i_mode = S_IFREG | S_IRUGO;
        inode->i_fop = &ns_file_operations;
index 139190165a1c2231ebb90fb364ee8bdb299b2b16..b96a5918d064f75e5083ef735a8db56d1e7746c2 100644 (file)
--- a/fs/pipe.c
+++ b/fs/pipe.c
@@ -898,7 +898,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_set_ctime_current(inode);
+       simple_inode_init_ts(inode);
 
        return inode;
 
index b5e01bdb5f5fd5a1be424d8c5f6bf3a0ce028eac..f189201199443dfb1b3adf5bc3d7d51009ab8706 100644 (file)
@@ -66,8 +66,8 @@ void fsstack_copy_attr_all(struct inode *dest, const struct inode *src)
        dest->i_uid = src->i_uid;
        dest->i_gid = src->i_gid;
        dest->i_rdev = src->i_rdev;
-       dest->i_atime = src->i_atime;
-       dest->i_mtime = src->i_mtime;
+       inode_set_atime_to_ts(dest, inode_get_atime(src));
+       inode_set_mtime_to_ts(dest, inode_get_mtime(src));
        inode_set_ctime_to_ts(dest, inode_get_ctime(src));
        dest->i_blkbits = src->i_blkbits;
        dest->i_flags = src->i_flags;
index d43a5cc1bfa46b142197c991343a295d375af60f..24bb0209e4599f934af06f6c0a9f984880b2fb34 100644 (file)
--- a/fs/stat.c
+++ b/fs/stat.c
@@ -57,8 +57,8 @@ void generic_fillattr(struct mnt_idmap *idmap, u32 request_mask,
        stat->gid = vfsgid_into_kgid(vfsgid);
        stat->rdev = inode->i_rdev;
        stat->size = i_size_read(inode);
-       stat->atime = inode->i_atime;
-       stat->mtime = inode->i_mtime;
+       stat->atime = inode_get_atime(inode);
+       stat->mtime = inode_get_mtime(inode);
        stat->ctime = inode_get_ctime(inode);
        stat->blksize = i_blocksize(inode);
        stat->blocks = inode->i_blocks;