Commit 8d2d878d authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Darrick J. Wong
Browse files

xfs: use a struct timespec64 for the in-core crtime 



struct xfs_icdinode is purely an in-memory data structure, so don't use
a log on-disk structure for it.  This simplifies the code a bit, and
also reduces our include hell slightly.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
[darrick: fix a minor indenting problem in xfs_trans_ichgtime]
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent d8d11fc7

fs/xfs/libxfs/xfs_inode_buf.c

+4 −4
Original line number Diff line number Diff line
@@ -256,8 +256,8 @@ xfs_inode_from_disk( 
	if (to->di_version == 3) {

		inode_set_iversion_queried(inode,

					   be64_to_cpu(from->di_changecount));

		to->di_crtime.t_sec = be32_to_cpu(from->di_crtime.t_sec);

		to->di_crtime.t_nsec = be32_to_cpu(from->di_crtime.t_nsec);

		to->di_crtime.tv_sec = be32_to_cpu(from->di_crtime.t_sec);

		to->di_crtime.tv_nsec = be32_to_cpu(from->di_crtime.t_nsec);

		to->di_flags2 = be64_to_cpu(from->di_flags2);

		to->di_cowextsize = be32_to_cpu(from->di_cowextsize);

	}
@@ -306,8 +306,8 @@ xfs_inode_to_disk( 


	if (from->di_version == 3) {

		to->di_changecount = cpu_to_be64(inode_peek_iversion(inode));

		to->di_crtime.t_sec = cpu_to_be32(from->di_crtime.t_sec);

		to->di_crtime.t_nsec = cpu_to_be32(from->di_crtime.t_nsec);

		to->di_crtime.t_sec = cpu_to_be32(from->di_crtime.tv_sec);

		to->di_crtime.t_nsec = cpu_to_be32(from->di_crtime.tv_nsec);

		to->di_flags2 = cpu_to_be64(from->di_flags2);

		to->di_cowextsize = cpu_to_be32(from->di_cowextsize);

		to->di_ino = cpu_to_be64(ip->i_ino);

fs/xfs/libxfs/xfs_inode_buf.h

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ struct xfs_icdinode { 
	uint64_t	di_flags2;	/* more random flags */

	uint32_t	di_cowextsize;	/* basic cow extent size for file */



	xfs_ictimestamp_t di_crtime;	/* time created */

	struct timespec64 di_crtime;	/* time created */

};



/*

fs/xfs/libxfs/xfs_trans_inode.c

+3 −5
Original line number Diff line number Diff line
@@ -66,10 +66,8 @@ xfs_trans_ichgtime( 
		inode->i_mtime = tv;

	if (flags & XFS_ICHGTIME_CHG)

		inode->i_ctime = tv;

	if (flags & XFS_ICHGTIME_CREATE) {

		ip->i_d.di_crtime.t_sec = (int32_t)tv.tv_sec;

		ip->i_d.di_crtime.t_nsec = (int32_t)tv.tv_nsec;

	}

	if (flags & XFS_ICHGTIME_CREATE)

		ip->i_d.di_crtime = tv;

}



/*

fs/xfs/xfs_inode.c

+1 −2
Original line number Diff line number Diff line
@@ -851,8 +851,7 @@ xfs_ialloc( 
		inode_set_iversion(inode, 1);

		ip->i_d.di_flags2 = 0;

		ip->i_d.di_cowextsize = 0;

		ip->i_d.di_crtime.t_sec = (int32_t)tv.tv_sec;

		ip->i_d.di_crtime.t_nsec = (int32_t)tv.tv_nsec;

		ip->i_d.di_crtime = tv;

	}

fs/xfs/xfs_inode_item.c

+2 −2
Original line number Diff line number Diff line
@@ -341,8 +341,8 @@ xfs_inode_to_log_dinode( 


	if (from->di_version == 3) {

		to->di_changecount = inode_peek_iversion(inode);

		to->di_crtime.t_sec = from->di_crtime.t_sec;

		to->di_crtime.t_nsec = from->di_crtime.t_nsec;

		to->di_crtime.t_sec = from->di_crtime.tv_sec;

		to->di_crtime.t_nsec = from->di_crtime.tv_nsec;

		to->di_flags2 = from->di_flags2;

		to->di_cowextsize = from->di_cowextsize;

		to->di_ino = ip->i_ino;

CRA Git | Maintained and supported by SUSTech CRA and CCSE