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

xfs: rename xfs_ictimestamp_t 



Rename xfs_ictimestamp_t to xfs_log_timestamp_t as it is a type used
for logging timestamps with no relationship to the in-core inode.

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 76adf92a

fs/xfs/libxfs/xfs_log_format.h

+5 −5
Original line number Diff line number Diff line
@@ -368,7 +368,7 @@ static inline int xfs_ilog_fdata(int w) 
 * directly mirrors the xfs_dinode structure as it must contain all the same

 * information.

 */

typedef uint64_t xfs_ictimestamp_t;

typedef uint64_t xfs_log_timestamp_t;



/* Legacy timestamp encoding format. */

struct xfs_legacy_ictimestamp {
@@ -393,9 +393,9 @@ struct xfs_log_dinode { 
	uint16_t	di_projid_hi;	/* higher part of owner's project id */

	uint8_t		di_pad[6];	/* unused, zeroed space */

	uint16_t	di_flushiter;	/* incremented on flush */

	xfs_ictimestamp_t di_atime;	/* time last accessed */

	xfs_ictimestamp_t di_mtime;	/* time last modified */

	xfs_ictimestamp_t di_ctime;	/* time created/inode modified */

	xfs_log_timestamp_t di_atime;	/* time last accessed */

	xfs_log_timestamp_t di_mtime;	/* time last modified */

	xfs_log_timestamp_t di_ctime;	/* time created/inode modified */

	xfs_fsize_t	di_size;	/* number of bytes in file */

	xfs_rfsblock_t	di_nblocks;	/* # of direct & btree blocks used */

	xfs_extlen_t	di_extsize;	/* basic/minimum extent size for file */
@@ -420,7 +420,7 @@ struct xfs_log_dinode { 
	uint8_t		di_pad2[12];	/* more padding for future expansion */



	/* fields only written to during inode creation */

	xfs_ictimestamp_t di_crtime;	/* time created */

	xfs_log_timestamp_t di_crtime;	/* time created */

	xfs_ino_t	di_ino;		/* inode number */

	uuid_t		di_uuid;	/* UUID of the filesystem */

fs/xfs/xfs_inode_item.c

+2 −2
Original line number Diff line number Diff line
@@ -299,13 +299,13 @@ xfs_inode_item_format_attr_fork( 
 * Convert an incore timestamp to a log timestamp.  Note that the log format

 * specifies host endian format!

 */

static inline xfs_ictimestamp_t

static inline xfs_log_timestamp_t

xfs_inode_to_log_dinode_ts(

	struct xfs_inode		*ip,

	const struct timespec64		tv)

{

	struct xfs_legacy_ictimestamp	*lits;

	xfs_ictimestamp_t		its;

	xfs_log_timestamp_t		its;



	if (xfs_inode_has_bigtime(ip))

		return xfs_inode_encode_bigtime(tv);

fs/xfs/xfs_inode_item_recover.c

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ static inline bool xfs_log_dinode_has_bigtime(const struct xfs_log_dinode *ld) 
static inline xfs_timestamp_t

xfs_log_dinode_to_disk_ts(

	struct xfs_log_dinode		*from,

	const xfs_ictimestamp_t		its)

	const xfs_log_timestamp_t	its)

{

	struct xfs_legacy_timestamp	*lts;

	struct xfs_legacy_ictimestamp	*lits;

fs/xfs/xfs_ondisk.h

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ xfs_check_ondisk_structs(void) 
	XFS_CHECK_STRUCT_SIZE(struct xfs_extent_64,		16);

	XFS_CHECK_STRUCT_SIZE(struct xfs_log_dinode,		176);

	XFS_CHECK_STRUCT_SIZE(struct xfs_icreate_log,		28);

	XFS_CHECK_STRUCT_SIZE(xfs_ictimestamp_t,		8);

	XFS_CHECK_STRUCT_SIZE(xfs_log_timestamp_t,		8);

	XFS_CHECK_STRUCT_SIZE(struct xfs_legacy_ictimestamp,	8);

	XFS_CHECK_STRUCT_SIZE(struct xfs_inode_log_format_32,	52);

	XFS_CHECK_STRUCT_SIZE(struct xfs_inode_log_format,	56);