Commit a0a415e3 authored by Jeff Layton's avatar Jeff Layton Committed by Christian Brauner
Browse files

xfs: 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.

Signed-off-by: default avatarJeff Layton <jlayton@kernel.org>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Message-Id: <20230705190309.579783-80-jlayton@kernel.org>
Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parent 0593be0c

fs/xfs/libxfs/xfs_inode_buf.c

+3 −2
Original line number Diff line number Diff line
@@ -222,7 +222,8 @@ xfs_inode_from_disk( 
	 */

	inode->i_atime = xfs_inode_from_disk_ts(from, from->di_atime);

	inode->i_mtime = xfs_inode_from_disk_ts(from, from->di_mtime);

	inode->i_ctime = xfs_inode_from_disk_ts(from, from->di_ctime);

	inode_set_ctime_to_ts(inode,

			      xfs_inode_from_disk_ts(from, from->di_ctime));



	ip->i_disk_size = be64_to_cpu(from->di_size);

	ip->i_nblocks = be64_to_cpu(from->di_nblocks);
@@ -316,7 +317,7 @@ xfs_inode_to_disk( 


	to->di_atime = xfs_inode_to_disk_ts(ip, inode->i_atime);

	to->di_mtime = xfs_inode_to_disk_ts(ip, inode->i_mtime);

	to->di_ctime = xfs_inode_to_disk_ts(ip, inode->i_ctime);

	to->di_ctime = xfs_inode_to_disk_ts(ip, inode_get_ctime(inode));

	to->di_nlink = cpu_to_be32(inode->i_nlink);

	to->di_gen = cpu_to_be32(inode->i_generation);

	to->di_mode = cpu_to_be16(inode->i_mode);

fs/xfs/libxfs/xfs_trans_inode.c

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ xfs_trans_ichgtime( 
	if (flags & XFS_ICHGTIME_MOD)

		inode->i_mtime = tv;

	if (flags & XFS_ICHGTIME_CHG)

		inode->i_ctime = tv;

		inode_set_ctime_to_ts(inode, tv);

	if (flags & XFS_ICHGTIME_CREATE)

		ip->i_crtime = tv;

}

fs/xfs/xfs_acl.c

+1 −1
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ xfs_acl_set_mode( 
	xfs_ilock(ip, XFS_ILOCK_EXCL);

	xfs_trans_ijoin(tp, ip, XFS_ILOCK_EXCL);

	inode->i_mode = mode;

	inode->i_ctime = current_time(inode);

	inode_set_ctime_current(inode);

	xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);



	if (xfs_has_wsync(mp))

fs/xfs/xfs_bmap_util.c

+4 −2
Original line number Diff line number Diff line
@@ -1644,6 +1644,7 @@ xfs_swap_extents( 
	uint64_t		f;

	int			resblks = 0;

	unsigned int		flags = 0;

	struct timespec64	ctime;



	/*

	 * Lock the inodes against other IO, page faults and truncate to
@@ -1756,8 +1757,9 @@ xfs_swap_extents( 
	 * process that the file was not changed out from

	 * under it.

	 */

	if ((sbp->bs_ctime.tv_sec != VFS_I(ip)->i_ctime.tv_sec) ||

	    (sbp->bs_ctime.tv_nsec != VFS_I(ip)->i_ctime.tv_nsec) ||

	ctime = inode_get_ctime(VFS_I(ip));

	if ((sbp->bs_ctime.tv_sec != ctime.tv_sec) ||

	    (sbp->bs_ctime.tv_nsec != ctime.tv_nsec) ||

	    (sbp->bs_mtime.tv_sec != VFS_I(ip)->i_mtime.tv_sec) ||

	    (sbp->bs_mtime.tv_nsec != VFS_I(ip)->i_mtime.tv_nsec)) {

		error = -EBUSY;

fs/xfs/xfs_inode.c

+1 −2
Original line number Diff line number Diff line
@@ -843,10 +843,9 @@ xfs_init_new_inode( 
	ip->i_df.if_nextents = 0;

	ASSERT(ip->i_nblocks == 0);



	tv = current_time(inode);

	tv = inode_set_ctime_current(inode);

	inode->i_mtime = tv;

	inode->i_atime = tv;

	inode->i_ctime = tv;



	ip->i_extsize = 0;

	ip->i_diflags = 0;