Merge tag 'at91-dt-5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux...

[linux-2.6-microblaze.git] / fs / xfs / xfs_inode_item.c

diff --git a/fs/xfs/xfs_inode_item.c b/fs/xfs/xfs_inode_item.c
index c1b3268..6764d12 100644 (file)
--- a/fs/xfs/xfs_inode_item.c
+++ b/fs/xfs/xfs_inode_item.c
@@ -299,18 +299,18 @@ 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;
+       struct xfs_log_legacy_timestamp *lits;
+       xfs_log_timestamp_t             its;
 
        if (xfs_inode_has_bigtime(ip))
                return xfs_inode_encode_bigtime(tv);
 
-       lits = (struct xfs_legacy_ictimestamp *)&its;
+       lits = (struct xfs_log_legacy_timestamp *)&its;
        lits->t_sec = tv.tv_sec;
        lits->t_nsec = tv.tv_nsec;