mirror of
git://git.yoctoproject.org/linux-yocto.git
synced 2025-10-23 07:23:12 +02:00
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>
This commit is contained in:
parent
b9170a2883
commit
2276e5ba85
|
@ -312,7 +312,7 @@ void setattr_copy(struct mnt_idmap *idmap, struct inode *inode,
|
||||||
if (ia_valid & ATTR_MTIME)
|
if (ia_valid & ATTR_MTIME)
|
||||||
inode->i_mtime = attr->ia_mtime;
|
inode->i_mtime = attr->ia_mtime;
|
||||||
if (ia_valid & ATTR_CTIME)
|
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) {
|
if (ia_valid & ATTR_MODE) {
|
||||||
umode_t mode = attr->ia_mode;
|
umode_t mode = attr->ia_mode;
|
||||||
if (!in_group_or_capable(idmap, inode,
|
if (!in_group_or_capable(idmap, inode,
|
||||||
|
|
|
@ -209,8 +209,7 @@ void make_bad_inode(struct inode *inode)
|
||||||
remove_inode_hash(inode);
|
remove_inode_hash(inode);
|
||||||
|
|
||||||
inode->i_mode = S_IFREG;
|
inode->i_mode = S_IFREG;
|
||||||
inode->i_atime = inode->i_mtime = inode->i_ctime =
|
inode->i_atime = inode->i_mtime = inode_set_ctime_current(inode);
|
||||||
current_time(inode);
|
|
||||||
inode->i_op = &bad_inode_ops;
|
inode->i_op = &bad_inode_ops;
|
||||||
inode->i_opflags &= ~IOP_XATTR;
|
inode->i_opflags &= ~IOP_XATTR;
|
||||||
inode->i_fop = &bad_file_ops;
|
inode->i_fop = &bad_file_ops;
|
||||||
|
|
|
@ -547,8 +547,7 @@ static struct inode *bm_get_inode(struct super_block *sb, int mode)
|
||||||
if (inode) {
|
if (inode) {
|
||||||
inode->i_ino = get_next_ino();
|
inode->i_ino = get_next_ino();
|
||||||
inode->i_mode = mode;
|
inode->i_mode = mode;
|
||||||
inode->i_atime = inode->i_mtime = inode->i_ctime =
|
inode->i_atime = inode->i_mtime = inode_set_ctime_current(inode);
|
||||||
current_time(inode);
|
|
||||||
}
|
}
|
||||||
return inode;
|
return inode;
|
||||||
}
|
}
|
||||||
|
|
10
fs/inode.c
10
fs/inode.c
|
@ -1853,6 +1853,7 @@ EXPORT_SYMBOL(bmap);
|
||||||
static int relatime_need_update(struct vfsmount *mnt, struct inode *inode,
|
static int relatime_need_update(struct vfsmount *mnt, struct inode *inode,
|
||||||
struct timespec64 now)
|
struct timespec64 now)
|
||||||
{
|
{
|
||||||
|
struct timespec64 ctime;
|
||||||
|
|
||||||
if (!(mnt->mnt_flags & MNT_RELATIME))
|
if (!(mnt->mnt_flags & MNT_RELATIME))
|
||||||
return 1;
|
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:
|
* 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;
|
return 1;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -1887,7 +1889,7 @@ int generic_update_time(struct inode *inode, struct timespec64 *time, int flags)
|
||||||
if (flags & S_ATIME)
|
if (flags & S_ATIME)
|
||||||
inode->i_atime = *time;
|
inode->i_atime = *time;
|
||||||
if (flags & S_CTIME)
|
if (flags & S_CTIME)
|
||||||
inode->i_ctime = *time;
|
inode_set_ctime_to_ts(inode, *time);
|
||||||
if (flags & S_MTIME)
|
if (flags & S_MTIME)
|
||||||
inode->i_mtime = *time;
|
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)
|
static int inode_needs_update_time(struct inode *inode, struct timespec64 *now)
|
||||||
{
|
{
|
||||||
int sync_it = 0;
|
int sync_it = 0;
|
||||||
|
struct timespec64 ctime;
|
||||||
|
|
||||||
/* First try to exhaust all avenues to not sync */
|
/* First try to exhaust all avenues to not sync */
|
||||||
if (IS_NOCMTIME(inode))
|
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))
|
if (!timespec64_equal(&inode->i_mtime, now))
|
||||||
sync_it = S_MTIME;
|
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;
|
sync_it |= S_CTIME;
|
||||||
|
|
||||||
if (IS_I_VERSION(inode) && inode_iversion_need_inc(inode))
|
if (IS_I_VERSION(inode) && inode_iversion_need_inc(inode))
|
||||||
|
|
|
@ -84,7 +84,7 @@ slow:
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
}
|
}
|
||||||
inode->i_ino = ns->inum;
|
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_flags |= S_IMMUTABLE;
|
||||||
inode->i_mode = S_IFREG | S_IRUGO;
|
inode->i_mode = S_IFREG | S_IRUGO;
|
||||||
inode->i_fop = &ns_file_operations;
|
inode->i_fop = &ns_file_operations;
|
||||||
|
|
|
@ -899,7 +899,7 @@ static struct inode * get_pipe_inode(void)
|
||||||
inode->i_mode = S_IFIFO | S_IRUSR | S_IWUSR;
|
inode->i_mode = S_IFIFO | S_IRUSR | S_IWUSR;
|
||||||
inode->i_uid = current_fsuid();
|
inode->i_uid = current_fsuid();
|
||||||
inode->i_gid = current_fsgid();
|
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;
|
return inode;
|
||||||
|
|
||||||
|
|
|
@ -1027,7 +1027,7 @@ int simple_set_acl(struct mnt_idmap *idmap, struct dentry *dentry,
|
||||||
return error;
|
return error;
|
||||||
}
|
}
|
||||||
|
|
||||||
inode->i_ctime = current_time(inode);
|
inode_set_ctime_current(inode);
|
||||||
if (IS_I_VERSION(inode))
|
if (IS_I_VERSION(inode))
|
||||||
inode_inc_iversion(inode);
|
inode_inc_iversion(inode);
|
||||||
set_cached_acl(inode, type, acl);
|
set_cached_acl(inode, type, acl);
|
||||||
|
|
|
@ -68,7 +68,7 @@ void fsstack_copy_attr_all(struct inode *dest, const struct inode *src)
|
||||||
dest->i_rdev = src->i_rdev;
|
dest->i_rdev = src->i_rdev;
|
||||||
dest->i_atime = src->i_atime;
|
dest->i_atime = src->i_atime;
|
||||||
dest->i_mtime = src->i_mtime;
|
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_blkbits = src->i_blkbits;
|
||||||
dest->i_flags = src->i_flags;
|
dest->i_flags = src->i_flags;
|
||||||
set_nlink(dest, src->i_nlink);
|
set_nlink(dest, src->i_nlink);
|
||||||
|
|
|
@ -58,7 +58,7 @@ void generic_fillattr(struct mnt_idmap *idmap, struct inode *inode,
|
||||||
stat->size = i_size_read(inode);
|
stat->size = i_size_read(inode);
|
||||||
stat->atime = inode->i_atime;
|
stat->atime = inode->i_atime;
|
||||||
stat->mtime = inode->i_mtime;
|
stat->mtime = inode->i_mtime;
|
||||||
stat->ctime = inode->i_ctime;
|
stat->ctime = inode_get_ctime(inode);
|
||||||
stat->blksize = i_blocksize(inode);
|
stat->blksize = i_blocksize(inode);
|
||||||
stat->blocks = inode->i_blocks;
|
stat->blocks = inode->i_blocks;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user