xfs: use a struct timespec64 for the in-core crtime

struct xfs_icdinode is purely an in-memory data structure, so don't use
a log on-disk structure for it.  This simplifies the code a bit, and
also reduces our include hell slightly.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
[darrick: fix a minor indenting problem in xfs_trans_ichgtime]
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>

diff --git a/fs/xfs/libxfs/xfs_inode_buf.c b/fs/xfs/libxfs/xfs_inode_buf.c
index 28ab3c5255e1875727e74655bc6134ca7ba5a858..d31156718b202b964d325c2751b94a99feecc7d4 100644 (file)
--- a/fs/xfs/libxfs/xfs_inode_buf.c
+++ b/fs/xfs/libxfs/xfs_inode_buf.c
@@ -256,8 +256,8 @@ xfs_inode_from_disk(
        if (to->di_version == 3) {
                inode_set_iversion_queried(inode,
                                           be64_to_cpu(from->di_changecount));
-               to->di_crtime.t_sec = be32_to_cpu(from->di_crtime.t_sec);
-               to->di_crtime.t_nsec = be32_to_cpu(from->di_crtime.t_nsec);
+               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);
                to->di_flags2 = be64_to_cpu(from->di_flags2);
                to->di_cowextsize = be32_to_cpu(from->di_cowextsize);
        }
@@ -306,8 +306,8 @@ xfs_inode_to_disk(
 
        if (from->di_version == 3) {
                to->di_changecount = cpu_to_be64(inode_peek_iversion(inode));
-               to->di_crtime.t_sec = cpu_to_be32(from->di_crtime.t_sec);
-               to->di_crtime.t_nsec = cpu_to_be32(from->di_crtime.t_nsec);
+               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);
                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/fs/xfs/libxfs/xfs_inode_buf.h b/fs/xfs/libxfs/xfs_inode_buf.h
index ab0f841653174e8d142a771c7bbca683a38e5737..c9ac69c82d21ffb34070b72746c2b2fa12a78a68 100644 (file)
--- a/fs/xfs/libxfs/xfs_inode_buf.h
+++ b/fs/xfs/libxfs/xfs_inode_buf.h
@@ -37,7 +37,7 @@ struct xfs_icdinode {
        uint64_t        di_flags2;      /* more random flags */
        uint32_t        di_cowextsize;  /* basic cow extent size for file */
 
-       xfs_ictimestamp_t di_crtime;    /* time created */
+       struct timespec64 di_crtime;    /* time created */
 };
 
 /*

diff --git a/fs/xfs/libxfs/xfs_trans_inode.c b/fs/xfs/libxfs/xfs_trans_inode.c
index a9ad90926b873fc6ba602cf13460ea175c0bef6c..2b8ccb5b975df35891479a5bae11a477e3a600f6 100644 (file)
--- a/fs/xfs/libxfs/xfs_trans_inode.c
+++ b/fs/xfs/libxfs/xfs_trans_inode.c
@@ -55,7 +55,7 @@ xfs_trans_ichgtime(
        int                     flags)
 {
        struct inode            *inode = VFS_I(ip);
-       struct timespec64 tv;
+       struct timespec64       tv;
 
        ASSERT(tp);
        ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL));
@@ -66,10 +66,8 @@ xfs_trans_ichgtime(
                inode->i_mtime = tv;
        if (flags & XFS_ICHGTIME_CHG)
                inode->i_ctime = tv;
-       if (flags & XFS_ICHGTIME_CREATE) {
-               ip->i_d.di_crtime.t_sec = (int32_t)tv.tv_sec;
-               ip->i_d.di_crtime.t_nsec = (int32_t)tv.tv_nsec;
-       }
+       if (flags & XFS_ICHGTIME_CREATE)
+               ip->i_d.di_crtime = tv;
 }
 
 /*

diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
index a92d4521748dfeb592488893b977b0adeace2004..caf4f830936e545bbc5cdcdfeb7224572bf09901 100644 (file)
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
@@ -851,8 +851,7 @@ xfs_ialloc(
                inode_set_iversion(inode, 1);
                ip->i_d.di_flags2 = 0;
                ip->i_d.di_cowextsize = 0;
-               ip->i_d.di_crtime.t_sec = (int32_t)tv.tv_sec;
-               ip->i_d.di_crtime.t_nsec = (int32_t)tv.tv_nsec;
+               ip->i_d.di_crtime = tv;
        }
 
 

diff --git a/fs/xfs/xfs_inode_item.c b/fs/xfs/xfs_inode_item.c
index 726aa3bfd6e84b4bf2c4e7947b958509d6548946..a3a75db4d15809cf0477f6ad6be6ff2a682a38b7 100644 (file)
--- a/fs/xfs/xfs_inode_item.c
+++ b/fs/xfs/xfs_inode_item.c
@@ -341,8 +341,8 @@ xfs_inode_to_log_dinode(
 
        if (from->di_version == 3) {
                to->di_changecount = inode_peek_iversion(inode);
-               to->di_crtime.t_sec = from->di_crtime.t_sec;
-               to->di_crtime.t_nsec = from->di_crtime.t_nsec;
+               to->di_crtime.t_sec = from->di_crtime.tv_sec;
+               to->di_crtime.t_nsec = from->di_crtime.tv_nsec;
                to->di_flags2 = from->di_flags2;
                to->di_cowextsize = from->di_cowextsize;
                to->di_ino = ip->i_ino;

diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c
index b129e077a5fafd229f9ed8a6b5bc400f02d83279..fc766b3f611902ba6931ae57ddcdec4bfcc67383 100644 (file)
--- a/fs/xfs/xfs_iops.c
+++ b/fs/xfs/xfs_iops.c
@@ -554,8 +554,7 @@ xfs_vn_getattr(
        if (ip->i_d.di_version == 3) {
                if (request_mask & STATX_BTIME) {
                        stat->result_mask |= STATX_BTIME;
-                       stat->btime.tv_sec = ip->i_d.di_crtime.t_sec;
-                       stat->btime.tv_nsec = ip->i_d.di_crtime.t_nsec;
+                       stat->btime = ip->i_d.di_crtime;
                }
        }
 

diff --git a/fs/xfs/xfs_itable.c b/fs/xfs/xfs_itable.c
index 884950adbd16470b35467ac4731445b024b8cc1f..11771112a634b57acdea07579217466ab416295d 100644 (file)
--- a/fs/xfs/xfs_itable.c
+++ b/fs/xfs/xfs_itable.c
@@ -97,8 +97,8 @@ xfs_bulkstat_one_int(
        buf->bs_mtime_nsec = inode->i_mtime.tv_nsec;
        buf->bs_ctime = inode->i_ctime.tv_sec;
        buf->bs_ctime_nsec = inode->i_ctime.tv_nsec;
-       buf->bs_btime = dic->di_crtime.t_sec;
-       buf->bs_btime_nsec = dic->di_crtime.t_nsec;
+       buf->bs_btime = dic->di_crtime.tv_sec;
+       buf->bs_btime_nsec = dic->di_crtime.tv_nsec;
        buf->bs_gen = inode->i_generation;
        buf->bs_mode = inode->i_mode;