xfs: move the di_crtime field to struct xfs_inode

Move the crtime field from struct xfs_icdinode into stuct xfs_inode and
remove the now entirely unused struct xfs_icdinode.

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_format.h b/fs/xfs/libxfs/xfs_format.h
index 630388b..76e2461 100644 (file)
--- a/fs/xfs/libxfs/xfs_format.h
+++ b/fs/xfs/libxfs/xfs_format.h
@@ -955,9 +955,8 @@ static inline time64_t xfs_bigtime_to_unix(uint64_t ondisk_seconds)
  * attribute use the XFS_DFORK_DPTR, XFS_DFORK_APTR, and XFS_DFORK_PTR macros
  * below.
  *
- * There is a very similar struct icdinode in xfs_inode which matches the
- * layout of the first 96 bytes of this structure, but is kept in native
- * format instead of big endian.
+ * There is a very similar struct xfs_log_dinode which matches the layout of
+ * this structure, but is kept in native format instead of big endian.
  *
  * Note: di_flushiter is only used by v1/2 inodes - it's effectively a zeroed
  * padding field for v3 inodes.

diff --git a/fs/xfs/libxfs/xfs_inode_buf.c b/fs/xfs/libxfs/xfs_inode_buf.c
index 82ee4b6..5c9a744 100644 (file)
--- a/fs/xfs/libxfs/xfs_inode_buf.c
+++ b/fs/xfs/libxfs/xfs_inode_buf.c
@@ -173,7 +173,6 @@ xfs_inode_from_disk(
        struct xfs_inode        *ip,
        struct xfs_dinode       *from)
 {
-       struct xfs_icdinode     *to = &ip->i_d;
        struct inode            *inode = VFS_I(ip);
        int                     error;
        xfs_failaddr_t          fa;
@@ -239,7 +238,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 = xfs_inode_from_disk_ts(from, from->di_crtime);
+               ip->i_crtime = xfs_inode_from_disk_ts(from, from->di_crtime);
                ip->i_diflags2 = be64_to_cpu(from->di_flags2);
                ip->i_cowextsize = be32_to_cpu(from->di_cowextsize);
        }
@@ -286,7 +285,6 @@ xfs_inode_to_disk(
        struct xfs_dinode       *to,
        xfs_lsn_t               lsn)
 {
-       struct xfs_icdinode     *from = &ip->i_d;
        struct inode            *inode = VFS_I(ip);
 
        to->di_magic = cpu_to_be16(XFS_DINODE_MAGIC);
@@ -318,7 +316,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 = xfs_inode_to_disk_ts(ip, from->di_crtime);
+               to->di_crtime = xfs_inode_to_disk_ts(ip, ip->i_crtime);
                to->di_flags2 = cpu_to_be64(ip->i_diflags2);
                to->di_cowextsize = cpu_to_be32(ip->i_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 2f6015a..7f865bb 100644 (file)
--- a/fs/xfs/libxfs/xfs_inode_buf.h
+++ b/fs/xfs/libxfs/xfs_inode_buf.h
@@ -9,16 +9,6 @@
 struct xfs_inode;
 struct xfs_dinode;
 
-/*
- * In memory representation of the XFS inode. This is held in the in-core struct
- * xfs_inode and represents the current on disk values but the structure is not
- * in on-disk format.  That is, this structure is always translated to on-disk
- * format specific structures at the appropriate time.
- */
-struct xfs_icdinode {
-       struct timespec64 di_crtime;    /* time created */
-};
-
 /*
  * Inode location information.  Stored in the inode and passed to
  * xfs_imap_to_bp() to get a buffer and dinode for a given inode.

diff --git a/fs/xfs/libxfs/xfs_trans_inode.c b/fs/xfs/libxfs/xfs_trans_inode.c
index 1029203..78324e0 100644 (file)
--- a/fs/xfs/libxfs/xfs_trans_inode.c
+++ b/fs/xfs/libxfs/xfs_trans_inode.c
@@ -70,7 +70,7 @@ xfs_trans_ichgtime(
        if (flags & XFS_ICHGTIME_CHG)
                inode->i_ctime = tv;
        if (flags & XFS_ICHGTIME_CREATE)
-               ip->i_d.di_crtime = tv;
+               ip->i_crtime = tv;
 }
 
 /*

diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
index 5aff2f9..3006cfb 100644 (file)
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
@@ -843,7 +843,7 @@ xfs_init_new_inode(
        if (xfs_sb_version_has_v3inode(&mp->m_sb)) {
                inode_set_iversion(inode, 1);
                ip->i_cowextsize = 0;
-               ip->i_d.di_crtime = tv;
+               ip->i_crtime = tv;
        }
 
        flags = XFS_ILOG_CORE;

diff --git a/fs/xfs/xfs_inode.h b/fs/xfs/xfs_inode.h
index 5d5f86e..ca826cf 100644 (file)
--- a/fs/xfs/xfs_inode.h
+++ b/fs/xfs/xfs_inode.h
@@ -66,8 +66,7 @@ typedef struct xfs_inode {
        uint8_t                 i_forkoff;      /* attr fork offset >> 3 */
        uint16_t                i_diflags;      /* XFS_DIFLAG_... */
        uint64_t                i_diflags2;     /* XFS_DIFLAG2_... */
-
-       struct xfs_icdinode     i_d;            /* most of ondisk inode */
+       struct timespec64       i_crtime;       /* time created */
 
        /* VFS inode */
        struct inode            i_vnode;        /* embedded VFS inode */

diff --git a/fs/xfs/xfs_inode_item.c b/fs/xfs/xfs_inode_item.c
index 1284672..c1b3268 100644 (file)
--- a/fs/xfs/xfs_inode_item.c
+++ b/fs/xfs/xfs_inode_item.c
@@ -350,7 +350,6 @@ xfs_inode_to_log_dinode(
        struct xfs_log_dinode   *to,
        xfs_lsn_t               lsn)
 {
-       struct xfs_icdinode     *from = &ip->i_d;
        struct inode            *inode = VFS_I(ip);
 
        to->di_magic = XFS_DINODE_MAGIC;
@@ -386,7 +385,7 @@ xfs_inode_to_log_dinode(
        if (xfs_sb_version_has_v3inode(&ip->i_mount->m_sb)) {
                to->di_version = 3;
                to->di_changecount = inode_peek_iversion(inode);
-               to->di_crtime = xfs_inode_to_log_dinode_ts(ip, from->di_crtime);
+               to->di_crtime = xfs_inode_to_log_dinode_ts(ip, ip->i_crtime);
                to->di_flags2 = ip->i_diflags2;
                to->di_cowextsize = ip->i_cowextsize;
                to->di_ino = ip->i_ino;

diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c
index 4f9bb7e..607b3f2 100644 (file)
--- a/fs/xfs/xfs_iops.c
+++ b/fs/xfs/xfs_iops.c
@@ -599,7 +599,7 @@ xfs_vn_getattr(
        if (xfs_sb_version_has_v3inode(&mp->m_sb)) {
                if (request_mask & STATX_BTIME) {
                        stat->result_mask |= STATX_BTIME;
-                       stat->btime = ip->i_d.di_crtime;
+                       stat->btime = ip->i_crtime;
                }
        }
 

diff --git a/fs/xfs/xfs_itable.c b/fs/xfs/xfs_itable.c
index 8799e38..f331975 100644 (file)
--- a/fs/xfs/xfs_itable.c
+++ b/fs/xfs/xfs_itable.c
@@ -60,7 +60,6 @@ xfs_bulkstat_one_int(
        struct xfs_bstat_chunk  *bc)
 {
        struct user_namespace   *sb_userns = mp->m_super->s_user_ns;
-       struct xfs_icdinode     *dic;           /* dinode core info pointer */
        struct xfs_inode        *ip;            /* incore inode pointer */
        struct inode            *inode;
        struct xfs_bulkstat     *buf = bc->buf;
@@ -81,8 +80,6 @@ xfs_bulkstat_one_int(
        ASSERT(ip->i_imap.im_blkno != 0);
        inode = VFS_I(ip);
 
-       dic = &ip->i_d;
-
        /* xfs_iget returns the following without needing
         * further change.
         */
@@ -111,8 +108,8 @@ xfs_bulkstat_one_int(
        buf->bs_version = XFS_BULKSTAT_VERSION_V5;
 
        if (xfs_sb_version_has_v3inode(&mp->m_sb)) {
-               buf->bs_btime = dic->di_crtime.tv_sec;
-               buf->bs_btime_nsec = dic->di_crtime.tv_nsec;
+               buf->bs_btime = ip->i_crtime.tv_sec;
+               buf->bs_btime_nsec = ip->i_crtime.tv_nsec;
                if (ip->i_diflags2 & XFS_DIFLAG2_COWEXTSIZE)
                        buf->bs_cowextsize_blks = ip->i_cowextsize;
        }