On Tue, Apr 20, 2021 at 06:26:03PM +0200, Christoph Hellwig wrote:
> 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: Christoph Hellwig <hch@xxxxxx>
> ---
> fs/xfs/libxfs/xfs_log_format.h | 10 +++++-----
> fs/xfs/xfs_inode_item.c | 4 ++--
> fs/xfs/xfs_inode_item_recover.c | 2 +-
> fs/xfs/xfs_ondisk.h | 2 +-
> 4 files changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/fs/xfs/libxfs/xfs_log_format.h b/fs/xfs/libxfs/xfs_log_format.h
> index 8bd00da6d2a40f..5900772d678a90 100644
> --- a/fs/xfs/libxfs/xfs_log_format.h
> +++ b/fs/xfs/libxfs/xfs_log_format.h
> @@ -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 {
Shouldn't you ^^^^^^^^^^^^^^^^^^ convert this one too?
--D
> @@ -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 */
>
> diff --git a/fs/xfs/xfs_inode_item.c b/fs/xfs/xfs_inode_item.c
> index c1b32680f71c73..6cc4ca15209ce5 100644
> --- a/fs/xfs/xfs_inode_item.c
> +++ b/fs/xfs/xfs_inode_item.c
> @@ -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);
> diff --git a/fs/xfs/xfs_inode_item_recover.c b/fs/xfs/xfs_inode_item_recover.c
> index cb44f7653f03bb..9b877de2ce5e3d 100644
> --- a/fs/xfs/xfs_inode_item_recover.c
> +++ b/fs/xfs/xfs_inode_item_recover.c
> @@ -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;
> diff --git a/fs/xfs/xfs_ondisk.h b/fs/xfs/xfs_ondisk.h
> index 0aa87c2101049c..66b541b7bb643d 100644
> --- a/fs/xfs/xfs_ondisk.h
> +++ b/fs/xfs/xfs_ondisk.h
> @@ -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);
> --
> 2.30.1
>
