Skip to content

Commit 2276e5b

Browse files
jtlaytonbrauner
authored andcommitted
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>
1 parent b9170a2 commit 2276e5b

File tree

9 files changed

+15
-13
lines changed

9 files changed

+15
-13
lines changed

fs/attr.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ void setattr_copy(struct mnt_idmap *idmap, struct inode *inode,
312312
if (ia_valid & ATTR_MTIME)
313313
inode->i_mtime = attr->ia_mtime;
314314
if (ia_valid & ATTR_CTIME)
315-
inode->i_ctime = attr->ia_ctime;
315+
inode_set_ctime_to_ts(inode, attr->ia_ctime);
316316
if (ia_valid & ATTR_MODE) {
317317
umode_t mode = attr->ia_mode;
318318
if (!in_group_or_capable(idmap, inode,

fs/bad_inode.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,8 +209,7 @@ void make_bad_inode(struct inode *inode)
209209
remove_inode_hash(inode);
210210

211211
inode->i_mode = S_IFREG;
212-
inode->i_atime = inode->i_mtime = inode->i_ctime =
213-
current_time(inode);
212+
inode->i_atime = inode->i_mtime = inode_set_ctime_current(inode);
214213
inode->i_op = &bad_inode_ops;
215214
inode->i_opflags &= ~IOP_XATTR;
216215
inode->i_fop = &bad_file_ops;

fs/binfmt_misc.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -547,8 +547,7 @@ static struct inode *bm_get_inode(struct super_block *sb, int mode)
547547
if (inode) {
548548
inode->i_ino = get_next_ino();
549549
inode->i_mode = mode;
550-
inode->i_atime = inode->i_mtime = inode->i_ctime =
551-
current_time(inode);
550+
inode->i_atime = inode->i_mtime = inode_set_ctime_current(inode);
552551
}
553552
return inode;
554553
}

fs/inode.c

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1853,6 +1853,7 @@ EXPORT_SYMBOL(bmap);
18531853
static int relatime_need_update(struct vfsmount *mnt, struct inode *inode,
18541854
struct timespec64 now)
18551855
{
1856+
struct timespec64 ctime;
18561857

18571858
if (!(mnt->mnt_flags & MNT_RELATIME))
18581859
return 1;
@@ -1864,7 +1865,8 @@ static int relatime_need_update(struct vfsmount *mnt, struct inode *inode,
18641865
/*
18651866
* Is ctime younger than or equal to atime? If yes, update atime:
18661867
*/
1867-
if (timespec64_compare(&inode->i_ctime, &inode->i_atime) >= 0)
1868+
ctime = inode_get_ctime(inode);
1869+
if (timespec64_compare(&ctime, &inode->i_atime) >= 0)
18681870
return 1;
18691871

18701872
/*
@@ -1887,7 +1889,7 @@ int generic_update_time(struct inode *inode, struct timespec64 *time, int flags)
18871889
if (flags & S_ATIME)
18881890
inode->i_atime = *time;
18891891
if (flags & S_CTIME)
1890-
inode->i_ctime = *time;
1892+
inode_set_ctime_to_ts(inode, *time);
18911893
if (flags & S_MTIME)
18921894
inode->i_mtime = *time;
18931895

@@ -2073,6 +2075,7 @@ EXPORT_SYMBOL(file_remove_privs);
20732075
static int inode_needs_update_time(struct inode *inode, struct timespec64 *now)
20742076
{
20752077
int sync_it = 0;
2078+
struct timespec64 ctime;
20762079

20772080
/* First try to exhaust all avenues to not sync */
20782081
if (IS_NOCMTIME(inode))
@@ -2081,7 +2084,8 @@ static int inode_needs_update_time(struct inode *inode, struct timespec64 *now)
20812084
if (!timespec64_equal(&inode->i_mtime, now))
20822085
sync_it = S_MTIME;
20832086

2084-
if (!timespec64_equal(&inode->i_ctime, now))
2087+
ctime = inode_get_ctime(inode);
2088+
if (!timespec64_equal(&ctime, now))
20852089
sync_it |= S_CTIME;
20862090

20872091
if (IS_I_VERSION(inode) && inode_iversion_need_inc(inode))

fs/nsfs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ static int __ns_get_path(struct path *path, struct ns_common *ns)
8484
return -ENOMEM;
8585
}
8686
inode->i_ino = ns->inum;
87-
inode->i_mtime = inode->i_atime = inode->i_ctime = current_time(inode);
87+
inode->i_mtime = inode->i_atime = inode_set_ctime_current(inode);
8888
inode->i_flags |= S_IMMUTABLE;
8989
inode->i_mode = S_IFREG | S_IRUGO;
9090
inode->i_fop = &ns_file_operations;

fs/pipe.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -899,7 +899,7 @@ static struct inode * get_pipe_inode(void)
899899
inode->i_mode = S_IFIFO | S_IRUSR | S_IWUSR;
900900
inode->i_uid = current_fsuid();
901901
inode->i_gid = current_fsgid();
902-
inode->i_atime = inode->i_mtime = inode->i_ctime = current_time(inode);
902+
inode->i_atime = inode->i_mtime = inode_set_ctime_current(inode);
903903

904904
return inode;
905905

fs/posix_acl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1027,7 +1027,7 @@ int simple_set_acl(struct mnt_idmap *idmap, struct dentry *dentry,
10271027
return error;
10281028
}
10291029

1030-
inode->i_ctime = current_time(inode);
1030+
inode_set_ctime_current(inode);
10311031
if (IS_I_VERSION(inode))
10321032
inode_inc_iversion(inode);
10331033
set_cached_acl(inode, type, acl);

fs/stack.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ void fsstack_copy_attr_all(struct inode *dest, const struct inode *src)
6868
dest->i_rdev = src->i_rdev;
6969
dest->i_atime = src->i_atime;
7070
dest->i_mtime = src->i_mtime;
71-
dest->i_ctime = src->i_ctime;
71+
inode_set_ctime_to_ts(dest, inode_get_ctime(src));
7272
dest->i_blkbits = src->i_blkbits;
7373
dest->i_flags = src->i_flags;
7474
set_nlink(dest, src->i_nlink);

fs/stat.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ void generic_fillattr(struct mnt_idmap *idmap, struct inode *inode,
5858
stat->size = i_size_read(inode);
5959
stat->atime = inode->i_atime;
6060
stat->mtime = inode->i_mtime;
61-
stat->ctime = inode->i_ctime;
61+
stat->ctime = inode_get_ctime(inode);
6262
stat->blksize = i_blocksize(inode);
6363
stat->blocks = inode->i_blocks;
6464
}

0 commit comments

Comments
 (0)