xfs: move the di_cowextsize field to struct xfs_inode

In preparation of removing the historic icinode struct, move the
cowextsize field into the containing xfs_inode structure.  Also
switch to use the xfs_extlen_t instead of a uint32_t.

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_inode_buf.c b/fs/xfs/libxfs/xfs_inode_buf.c
index bb709584921d8b38a6c1d0f7958ee7943df6f24d..2656acbb95e6081f98d7f63b095c9de4b089938b 100644 (file)
--- a/fs/xfs/libxfs/xfs_inode_buf.c
+++ b/fs/xfs/libxfs/xfs_inode_buf.c
@@ -240,7 +240,7 @@ xfs_inode_from_disk(
                                           be64_to_cpu(from->di_changecount));
                to->di_crtime = xfs_inode_from_disk_ts(from, from->di_crtime);
                to->di_flags2 = be64_to_cpu(from->di_flags2);
-               to->di_cowextsize = be32_to_cpu(from->di_cowextsize);
+               ip->i_cowextsize = be32_to_cpu(from->di_cowextsize);
        }
 
        error = xfs_iformat_data_fork(ip, from);
@@ -319,7 +319,7 @@ xfs_inode_to_disk(
                to->di_changecount = cpu_to_be64(inode_peek_iversion(inode));
                to->di_crtime = xfs_inode_to_disk_ts(ip, from->di_crtime);
                to->di_flags2 = cpu_to_be64(from->di_flags2);
-               to->di_cowextsize = cpu_to_be32(from->di_cowextsize);
+               to->di_cowextsize = cpu_to_be32(ip->i_cowextsize);
                to->di_ino = cpu_to_be64(ip->i_ino);
                to->di_lsn = cpu_to_be64(lsn);
                memset(to->di_pad2, 0, sizeof(to->di_pad2));

diff --git a/fs/xfs/libxfs/xfs_inode_buf.h b/fs/xfs/libxfs/xfs_inode_buf.h
index 6bc78856373e31039b9320c002afcb3f80732713..77d250dbe9684813ae00bba12b477588d2f6a041 100644 (file)
--- a/fs/xfs/libxfs/xfs_inode_buf.h
+++ b/fs/xfs/libxfs/xfs_inode_buf.h
@@ -21,7 +21,6 @@ struct xfs_icdinode {
        uint16_t        di_flags;       /* random flags, XFS_DIFLAG_... */
 
        uint64_t        di_flags2;      /* more random flags */
-       uint32_t        di_cowextsize;  /* basic cow extent size for file */
 
        struct timespec64 di_crtime;    /* time created */
 };

diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c
index 4c930078f45d8247ee570981063e74a4ade75d57..d755fbf3640beef3ba4d0585a1103ef4d8d0746c 100644 (file)
--- a/fs/xfs/xfs_file.c
+++ b/fs/xfs/xfs_file.c
@@ -1162,7 +1162,7 @@ xfs_file_remap_range(
            (src->i_d.di_flags2 & XFS_DIFLAG2_COWEXTSIZE) &&
            pos_out == 0 && len >= i_size_read(inode_out) &&
            !(dest->i_d.di_flags2 & XFS_DIFLAG2_COWEXTSIZE))
-               cowextsize = src->i_d.di_cowextsize;
+               cowextsize = src->i_cowextsize;
 
        ret = xfs_reflink_update_dest(dest, pos_out + len, cowextsize,
                        remap_flags);

diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
index 46b1af91e78ddf80070748c05d19759cd04d592c..cfd589c64ad9c395f7e4c1c785dc2ffd6ad970a9 100644 (file)
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
@@ -81,7 +81,7 @@ xfs_get_cowextsz_hint(
 
        a = 0;
        if (ip->i_d.di_flags2 & XFS_DIFLAG2_COWEXTSIZE)
-               a = ip->i_d.di_cowextsize;
+               a = ip->i_cowextsize;
        b = xfs_get_extsz_hint(ip);
 
        a = max(a, b);
@@ -754,7 +754,7 @@ xfs_inode_inherit_flags2(
 {
        if (pip->i_d.di_flags2 & XFS_DIFLAG2_COWEXTSIZE) {
                ip->i_d.di_flags2 |= XFS_DIFLAG2_COWEXTSIZE;
-               ip->i_d.di_cowextsize = pip->i_d.di_cowextsize;
+               ip->i_cowextsize = pip->i_cowextsize;
        }
        if (pip->i_d.di_flags2 & XFS_DIFLAG2_DAX)
                ip->i_d.di_flags2 |= XFS_DIFLAG2_DAX;
@@ -844,7 +844,7 @@ xfs_init_new_inode(
 
        if (xfs_sb_version_has_v3inode(&mp->m_sb)) {
                inode_set_iversion(inode, 1);
-               ip->i_d.di_cowextsize = 0;
+               ip->i_cowextsize = 0;
                ip->i_d.di_crtime = tv;
        }
 

diff --git a/fs/xfs/xfs_inode.h b/fs/xfs/xfs_inode.h
index 0d4ed688968086c95ee89d0460399d92a10e1393..0ca1d4dd90b5f33978342c2807f51975029e82d7 100644 (file)
--- a/fs/xfs/xfs_inode.h
+++ b/fs/xfs/xfs_inode.h
@@ -58,6 +58,7 @@ typedef struct xfs_inode {
        xfs_rfsblock_t          i_nblocks;      /* # of direct & btree blocks */
        prid_t                  i_projid;       /* owner's project id */
        xfs_extlen_t            i_extsize;      /* basic/minimum extent size */
+       xfs_extlen_t            i_cowextsize;   /* basic cow extent size */
 
        struct xfs_icdinode     i_d;            /* most of ondisk inode */
 

diff --git a/fs/xfs/xfs_inode_item.c b/fs/xfs/xfs_inode_item.c
index a0136fe771f0769ec5b755815c35d754fbfb3f2a..ebb2ce03f8e04caf685443d43e83babfb6572793 100644 (file)
--- a/fs/xfs/xfs_inode_item.c
+++ b/fs/xfs/xfs_inode_item.c
@@ -388,7 +388,7 @@ xfs_inode_to_log_dinode(
                to->di_changecount = inode_peek_iversion(inode);
                to->di_crtime = xfs_inode_to_log_dinode_ts(ip, from->di_crtime);
                to->di_flags2 = from->di_flags2;
-               to->di_cowextsize = from->di_cowextsize;
+               to->di_cowextsize = ip->i_cowextsize;
                to->di_ino = ip->i_ino;
                to->di_lsn = lsn;
                memset(to->di_pad2, 0, sizeof(to->di_pad2));

diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
index ec769219e435e9f82d38c6fcc7617be1bef83233..e45bce9b11082ce9dfa7fc1f21e2e462cefcb723 100644 (file)
--- a/fs/xfs/xfs_ioctl.c
+++ b/fs/xfs/xfs_ioctl.c
@@ -1121,8 +1121,7 @@ xfs_fill_fsxattr(
 
        simple_fill_fsxattr(fa, xfs_ip2xflags(ip));
        fa->fsx_extsize = ip->i_extsize << ip->i_mount->m_sb.sb_blocklog;
-       fa->fsx_cowextsize = ip->i_d.di_cowextsize <<
-                       ip->i_mount->m_sb.sb_blocklog;
+       fa->fsx_cowextsize = ip->i_cowextsize << ip->i_mount->m_sb.sb_blocklog;
        fa->fsx_projid = ip->i_projid;
        if (ifp && (ifp->if_flags & XFS_IFEXTENTS))
                fa->fsx_nextents = xfs_iext_count(ifp);
@@ -1524,10 +1523,9 @@ xfs_ioctl_setattr(
                ip->i_extsize = 0;
        if (xfs_sb_version_has_v3inode(&mp->m_sb) &&
            (ip->i_d.di_flags2 & XFS_DIFLAG2_COWEXTSIZE))
-               ip->i_d.di_cowextsize = fa->fsx_cowextsize >>
-                               mp->m_sb.sb_blocklog;
+               ip->i_cowextsize = fa->fsx_cowextsize >> mp->m_sb.sb_blocklog;
        else
-               ip->i_d.di_cowextsize = 0;
+               ip->i_cowextsize = 0;
 
        error = xfs_trans_commit(tp);
 

diff --git a/fs/xfs/xfs_itable.c b/fs/xfs/xfs_itable.c
index 7e2340ee2f37b643d250d6508392cc6b4fbca445..574e74b620f60ef4a4fef032a716c5feb3d1bea5 100644 (file)
--- a/fs/xfs/xfs_itable.c
+++ b/fs/xfs/xfs_itable.c
@@ -114,7 +114,7 @@ xfs_bulkstat_one_int(
                buf->bs_btime = dic->di_crtime.tv_sec;
                buf->bs_btime_nsec = dic->di_crtime.tv_nsec;
                if (dic->di_flags2 & XFS_DIFLAG2_COWEXTSIZE)
-                       buf->bs_cowextsize_blks = dic->di_cowextsize;
+                       buf->bs_cowextsize_blks = ip->i_cowextsize;
        }
 
        switch (ip->i_df.if_format) {

diff --git a/fs/xfs/xfs_reflink.c b/fs/xfs/xfs_reflink.c
index 306f13dfbfd8562cc7ebdce040809b4214350310..d8735b3ee0f807f77a27250f112cd35253ec5c05 100644 (file)
--- a/fs/xfs/xfs_reflink.c
+++ b/fs/xfs/xfs_reflink.c
@@ -934,7 +934,7 @@ xfs_reflink_update_dest(
        }
 
        if (cowextsize) {
-               dest->i_d.di_cowextsize = cowextsize;
+               dest->i_cowextsize = cowextsize;
                dest->i_d.di_flags2 |= XFS_DIFLAG2_COWEXTSIZE;
        }