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: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Darrick J. Wong <djwong@kernel.org>

diff --git a/fs/xfs/libxfs/xfs_log_format.h b/fs/xfs/libxfs/xfs_log_format.h
index 8bd00da6d2a40f6ce2f45b0cb9db7dbf9545c64e..5900772d678a90893045a69fe8888824c3ef0641 100644 (file)
--- 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 {
@@ -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 c1b32680f71c73bcb5b6c12476da15a5790939ec..6cc4ca15209ce56c87800a8b322841a7996249ff 100644 (file)
--- 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 cb44f7653f03bb0b8a5f8eeba89d1d10ec404bf2..9b877de2ce5e3da8e407fabad9a445e41c071ac5 100644 (file)
--- 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 0aa87c2101049c59fdb3ab145c5bcac9f0174354..66b541b7bb643df650222ef42aad67c2aa64d5cb 100644 (file)
--- 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);