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

xfs: move the di_crtime field to struct xfs_inode 



Move the crtime field from struct xfs_icdinode into stuct xfs_inode and
remove the now entirely unused struct xfs_icdinode.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
parent 3e09ab8f

fs/xfs/libxfs/xfs_format.h

+2 −3
Original line number Diff line number Diff line
@@ -955,9 +955,8 @@ static inline time64_t xfs_bigtime_to_unix(uint64_t ondisk_seconds) 
 * attribute use the XFS_DFORK_DPTR, XFS_DFORK_APTR, and XFS_DFORK_PTR macros

 * below.

 *

 * There is a very similar struct icdinode in xfs_inode which matches the

 * layout of the first 96 bytes of this structure, but is kept in native

 * format instead of big endian.

 * There is a very similar struct xfs_log_dinode which matches the layout of

 * this structure, but is kept in native format instead of big endian.

 *

 * Note: di_flushiter is only used by v1/2 inodes - it's effectively a zeroed

 * padding field for v3 inodes.

fs/xfs/libxfs/xfs_inode_buf.c

+2 −4
Original line number Diff line number Diff line
@@ -173,7 +173,6 @@ xfs_inode_from_disk( 
	struct xfs_inode	*ip,

	struct xfs_dinode	*from)

{

	struct xfs_icdinode	*to = &ip->i_d;

	struct inode		*inode = VFS_I(ip);

	int			error;

	xfs_failaddr_t		fa;
@@ -239,7 +238,7 @@ xfs_inode_from_disk( 
	if (xfs_sb_version_has_v3inode(&ip->i_mount->m_sb)) {

		inode_set_iversion_queried(inode,

					   be64_to_cpu(from->di_changecount));

		to->di_crtime = xfs_inode_from_disk_ts(from, from->di_crtime);

		ip->i_crtime = xfs_inode_from_disk_ts(from, from->di_crtime);

		ip->i_diflags2 = be64_to_cpu(from->di_flags2);

		ip->i_cowextsize = be32_to_cpu(from->di_cowextsize);

	}
@@ -286,7 +285,6 @@ xfs_inode_to_disk( 
	struct xfs_dinode	*to,

	xfs_lsn_t		lsn)

{

	struct xfs_icdinode	*from = &ip->i_d;

	struct inode		*inode = VFS_I(ip);



	to->di_magic = cpu_to_be16(XFS_DINODE_MAGIC);
@@ -318,7 +316,7 @@ xfs_inode_to_disk( 
	if (xfs_sb_version_has_v3inode(&ip->i_mount->m_sb)) {

		to->di_version = 3;

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

		to->di_crtime = xfs_inode_to_disk_ts(ip, from->di_crtime);

		to->di_crtime = xfs_inode_to_disk_ts(ip, ip->i_crtime);

		to->di_flags2 = cpu_to_be64(ip->i_diflags2);

		to->di_cowextsize = cpu_to_be32(ip->i_cowextsize);

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

fs/xfs/libxfs/xfs_inode_buf.h

+0 −10
Original line number Diff line number Diff line
@@ -9,16 +9,6 @@ 
struct xfs_inode;

struct xfs_dinode;



/*

 * In memory representation of the XFS inode. This is held in the in-core struct

 * xfs_inode and represents the current on disk values but the structure is not

 * in on-disk format.  That is, this structure is always translated to on-disk

 * format specific structures at the appropriate time.

 */

struct xfs_icdinode {

	struct timespec64 di_crtime;	/* time created */

};



/*

 * Inode location information.  Stored in the inode and passed to

 * xfs_imap_to_bp() to get a buffer and dinode for a given inode.

fs/xfs/libxfs/xfs_trans_inode.c

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

		inode->i_ctime = tv;

	if (flags & XFS_ICHGTIME_CREATE)

		ip->i_d.di_crtime = tv;

		ip->i_crtime = tv;

}



/*

fs/xfs/xfs_inode.c

+1 −1
Original line number Diff line number Diff line
@@ -843,7 +843,7 @@ xfs_init_new_inode( 
	if (xfs_sb_version_has_v3inode(&mp->m_sb)) {

		inode_set_iversion(inode, 1);

		ip->i_cowextsize = 0;

		ip->i_d.di_crtime = tv;

		ip->i_crtime = tv;

	}



	flags = XFS_ILOG_CORE;