From: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
Refactor inode timestamp encoding and decoding into helper functions so
that we can add extra behaviors in subsequent patches.
Signed-off-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
---
libxfs/xfs_inode_buf.c | 42 ++++++++++++++++++++++++++----------------
libxfs/xfs_inode_buf.h | 5 +++++
2 files changed, 31 insertions(+), 16 deletions(-)
diff --git a/libxfs/xfs_inode_buf.c b/libxfs/xfs_inode_buf.c
index ecb9abd82a3e..9f7309f9a576 100644
--- a/libxfs/xfs_inode_buf.c
+++ b/libxfs/xfs_inode_buf.c
@@ -158,6 +158,15 @@ xfs_imap_to_bp(
return 0;
}
+void
+xfs_inode_from_disk_timestamp(
+ struct timespec64 *tv,
+ const struct xfs_timestamp *ts)
+{
+ tv->tv_sec = (int)be32_to_cpu(ts->t_sec);
+ tv->tv_nsec = (int)be32_to_cpu(ts->t_nsec);
+}
+
int
xfs_inode_from_disk(
struct xfs_inode *ip,
@@ -212,12 +221,9 @@ xfs_inode_from_disk(
* a time before epoch is converted to a time long after epoch
* on 64 bit systems.
*/
- inode->i_atime.tv_sec = (int)be32_to_cpu(from->di_atime.t_sec);
- inode->i_atime.tv_nsec = (int)be32_to_cpu(from->di_atime.t_nsec);
- inode->i_mtime.tv_sec = (int)be32_to_cpu(from->di_mtime.t_sec);
- inode->i_mtime.tv_nsec = (int)be32_to_cpu(from->di_mtime.t_nsec);
- inode->i_ctime.tv_sec = (int)be32_to_cpu(from->di_ctime.t_sec);
- inode->i_ctime.tv_nsec = (int)be32_to_cpu(from->di_ctime.t_nsec);
+ xfs_inode_from_disk_timestamp(&inode->i_atime, &from->di_atime);
+ xfs_inode_from_disk_timestamp(&inode->i_mtime, &from->di_mtime);
+ xfs_inode_from_disk_timestamp(&inode->i_ctime, &from->di_ctime);
to->di_size = be64_to_cpu(from->di_size);
to->di_nblocks = be64_to_cpu(from->di_nblocks);
@@ -230,8 +236,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.tv_sec = be32_to_cpu(from->di_crtime.t_sec);
- to->di_crtime.tv_nsec = be32_to_cpu(from->di_crtime.t_nsec);
+ xfs_inode_from_disk_timestamp(&to->di_crtime, &from->di_crtime);
to->di_flags2 = be64_to_cpu(from->di_flags2);
to->di_cowextsize = be32_to_cpu(from->di_cowextsize);
}
@@ -253,6 +258,15 @@ xfs_inode_from_disk(
return error;
}
+void
+xfs_inode_to_disk_timestamp(
+ struct xfs_timestamp *ts,
+ const struct timespec64 *tv)
+{
+ ts->t_sec = cpu_to_be32(tv->tv_sec);
+ ts->t_nsec = cpu_to_be32(tv->tv_nsec);
+}
+
void
xfs_inode_to_disk(
struct xfs_inode *ip,
@@ -272,12 +286,9 @@ xfs_inode_to_disk(
to->di_projid_hi = cpu_to_be16(from->di_projid >> 16);
memset(to->di_pad, 0, sizeof(to->di_pad));
- to->di_atime.t_sec = cpu_to_be32(inode->i_atime.tv_sec);
- to->di_atime.t_nsec = cpu_to_be32(inode->i_atime.tv_nsec);
- to->di_mtime.t_sec = cpu_to_be32(inode->i_mtime.tv_sec);
- to->di_mtime.t_nsec = cpu_to_be32(inode->i_mtime.tv_nsec);
- to->di_ctime.t_sec = cpu_to_be32(inode->i_ctime.tv_sec);
- to->di_ctime.t_nsec = cpu_to_be32(inode->i_ctime.tv_nsec);
+ xfs_inode_to_disk_timestamp(&to->di_atime, &inode->i_atime);
+ xfs_inode_to_disk_timestamp(&to->di_mtime, &inode->i_mtime);
+ xfs_inode_to_disk_timestamp(&to->di_ctime, &inode->i_ctime);
to->di_nlink = cpu_to_be32(inode->i_nlink);
to->di_gen = cpu_to_be32(inode->i_generation);
to->di_mode = cpu_to_be16(inode->i_mode);
@@ -296,8 +307,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.t_sec = cpu_to_be32(from->di_crtime.tv_sec);
- to->di_crtime.t_nsec = cpu_to_be32(from->di_crtime.tv_nsec);
+ xfs_inode_to_disk_timestamp(&to->di_crtime, &from->di_crtime);
to->di_flags2 = cpu_to_be64(from->di_flags2);
to->di_cowextsize = cpu_to_be32(from->di_cowextsize);
to->di_ino = cpu_to_be64(ip->i_ino);
diff --git a/libxfs/xfs_inode_buf.h b/libxfs/xfs_inode_buf.h
index 89f7bea8efd6..9c63f3f932d7 100644
--- a/libxfs/xfs_inode_buf.h
+++ b/libxfs/xfs_inode_buf.h
@@ -58,4 +58,9 @@ xfs_failaddr_t xfs_inode_validate_cowextsize(struct xfs_mount *mp,
uint32_t cowextsize, uint16_t mode, uint16_t flags,
uint64_t flags2);
+void xfs_inode_from_disk_timestamp(struct timespec64 *tv,
+ const struct xfs_timestamp *ts);
+void xfs_inode_to_disk_timestamp(struct xfs_timestamp *ts,
+ const struct timespec64 *tv);
+
#endif /* __XFS_INODE_BUF_H__ */
