On Sat, Jun 20, 2020 at 09:10:52AM +0200, Christoph Hellwig wrote:
> In preparation of removing the historic icinode struct, move the extsize
> field into the containing xfs_inode structure.
>
> Signed-off-by: Christoph Hellwig <hch@xxxxxx>
Looks good,
Reviewed-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
--D
> ---
> fs/xfs/libxfs/xfs_bmap.c | 2 +-
> fs/xfs/libxfs/xfs_inode_buf.c | 4 ++--
> fs/xfs/libxfs/xfs_inode_buf.h | 1 -
> fs/xfs/xfs_inode.c | 10 +++++-----
> fs/xfs/xfs_inode.h | 1 +
> fs/xfs/xfs_inode_item.c | 2 +-
> fs/xfs/xfs_ioctl.c | 10 +++++-----
> fs/xfs/xfs_itable.c | 2 +-
> 8 files changed, 16 insertions(+), 16 deletions(-)
>
> diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
> index 54f3015f08285a..692159357ed8e5 100644
> --- a/fs/xfs/libxfs/xfs_bmap.c
> +++ b/fs/xfs/libxfs/xfs_bmap.c
> @@ -2942,7 +2942,7 @@ xfs_bmap_add_extent_hole_real(
> */
>
> /*
> - * Adjust the size of the new extent based on di_extsize and rt extsize.
> + * Adjust the size of the new extent based on i_extsize and rt extsize.
> */
> int
> xfs_bmap_extsize_align(
> diff --git a/fs/xfs/libxfs/xfs_inode_buf.c b/fs/xfs/libxfs/xfs_inode_buf.c
> index d1a15778e86a38..e51b15c44bb3e1 100644
> --- a/fs/xfs/libxfs/xfs_inode_buf.c
> +++ b/fs/xfs/libxfs/xfs_inode_buf.c
> @@ -243,7 +243,7 @@ xfs_inode_from_disk(
>
> ip->i_disk_size = be64_to_cpu(from->di_size);
> ip->i_nblocks = be64_to_cpu(from->di_nblocks);
> - to->di_extsize = be32_to_cpu(from->di_extsize);
> + ip->i_extsize = be32_to_cpu(from->di_extsize);
> to->di_forkoff = from->di_forkoff;
> to->di_dmevmask = be32_to_cpu(from->di_dmevmask);
> to->di_dmstate = be16_to_cpu(from->di_dmstate);
> @@ -306,7 +306,7 @@ xfs_inode_to_disk(
>
> to->di_size = cpu_to_be64(ip->i_disk_size);
> to->di_nblocks = cpu_to_be64(ip->i_nblocks);
> - to->di_extsize = cpu_to_be32(from->di_extsize);
> + to->di_extsize = cpu_to_be32(ip->i_extsize);
> to->di_nextents = cpu_to_be32(xfs_ifork_nextents(&ip->i_df));
> to->di_anextents = cpu_to_be16(xfs_ifork_nextents(ip->i_afp));
> to->di_forkoff = from->di_forkoff;
> diff --git a/fs/xfs/libxfs/xfs_inode_buf.h b/fs/xfs/libxfs/xfs_inode_buf.h
> index a322e1adf0a348..d420ea835c8390 100644
> --- a/fs/xfs/libxfs/xfs_inode_buf.h
> +++ b/fs/xfs/libxfs/xfs_inode_buf.h
> @@ -17,7 +17,6 @@ struct xfs_dinode;
> */
> struct xfs_icdinode {
> uint16_t di_flushiter; /* incremented on flush */
> - xfs_extlen_t di_extsize; /* basic/minimum extent size for file */
> uint8_t di_forkoff; /* attr fork offs, <<3 for 64b align */
> uint32_t di_dmevmask; /* DMIG event mask */
> uint16_t di_dmstate; /* DMIG state info */
> diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
> index 19d132acc499cb..6d1891f902aaa9 100644
> --- a/fs/xfs/xfs_inode.c
> +++ b/fs/xfs/xfs_inode.c
> @@ -61,8 +61,8 @@ xfs_get_extsz_hint(
> */
> if (xfs_is_always_cow_inode(ip))
> return 0;
> - if ((ip->i_d.di_flags & XFS_DIFLAG_EXTSIZE) && ip->i_d.di_extsize)
> - return ip->i_d.di_extsize;
> + if ((ip->i_d.di_flags & XFS_DIFLAG_EXTSIZE) && ip->i_extsize)
> + return ip->i_extsize;
> if (XFS_IS_REALTIME_INODE(ip))
> return ip->i_mount->m_sb.sb_rextsize;
> return 0;
> @@ -834,7 +834,7 @@ xfs_ialloc(
> inode->i_atime = tv;
> inode->i_ctime = tv;
>
> - ip->i_d.di_extsize = 0;
> + ip->i_extsize = 0;
> ip->i_d.di_dmevmask = 0;
> ip->i_d.di_dmstate = 0;
> ip->i_d.di_flags = 0;
> @@ -866,7 +866,7 @@ xfs_ialloc(
> di_flags |= XFS_DIFLAG_RTINHERIT;
> if (pip->i_d.di_flags & XFS_DIFLAG_EXTSZINHERIT) {
> di_flags |= XFS_DIFLAG_EXTSZINHERIT;
> - ip->i_d.di_extsize = pip->i_d.di_extsize;
> + ip->i_extsize = pip->i_extsize;
> }
> if (pip->i_d.di_flags & XFS_DIFLAG_PROJINHERIT)
> di_flags |= XFS_DIFLAG_PROJINHERIT;
> @@ -875,7 +875,7 @@ xfs_ialloc(
> di_flags |= XFS_DIFLAG_REALTIME;
> if (pip->i_d.di_flags & XFS_DIFLAG_EXTSZINHERIT) {
> di_flags |= XFS_DIFLAG_EXTSIZE;
> - ip->i_d.di_extsize = pip->i_d.di_extsize;
> + ip->i_extsize = pip->i_extsize;
> }
> }
> if ((pip->i_d.di_flags & XFS_DIFLAG_NOATIME) &&
> diff --git a/fs/xfs/xfs_inode.h b/fs/xfs/xfs_inode.h
> index 828f49f109475e..af90c6f745549b 100644
> --- a/fs/xfs/xfs_inode.h
> +++ b/fs/xfs/xfs_inode.h
> @@ -57,6 +57,7 @@ typedef struct xfs_inode {
> xfs_fsize_t i_disk_size; /* number of bytes in file */
> xfs_rfsblock_t i_nblocks; /* # of direct & btree blocks */
> uint32_t i_projid; /* owner's project id */
> + xfs_extlen_t i_extsize; /* basic/minimum 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 0980fa43472cf8..8b8c99809f273e 100644
> --- a/fs/xfs/xfs_inode_item.c
> +++ b/fs/xfs/xfs_inode_item.c
> @@ -325,7 +325,7 @@ xfs_inode_to_log_dinode(
>
> to->di_size = ip->i_disk_size;
> to->di_nblocks = ip->i_nblocks;
> - to->di_extsize = from->di_extsize;
> + to->di_extsize = ip->i_extsize;
> to->di_nextents = xfs_ifork_nextents(&ip->i_df);
> to->di_anextents = xfs_ifork_nextents(ip->i_afp);
> to->di_forkoff = from->di_forkoff;
> diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
> index d93f4fc40fd99e..efe3b5bc1178dc 100644
> --- a/fs/xfs/xfs_ioctl.c
> +++ b/fs/xfs/xfs_ioctl.c
> @@ -1107,7 +1107,7 @@ xfs_fill_fsxattr(
> struct xfs_ifork *ifp = attr ? ip->i_afp : &ip->i_df;
>
> simple_fill_fsxattr(fa, xfs_ip2xflags(ip));
> - fa->fsx_extsize = ip->i_d.di_extsize << ip->i_mount->m_sb.sb_blocklog;
> + 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_projid = ip->i_projid;
> @@ -1209,7 +1209,7 @@ xfs_ioctl_setattr_xflags(
> /* If realtime flag is set then must have realtime device */
> if (fa->fsx_xflags & FS_XFLAG_REALTIME) {
> if (mp->m_sb.sb_rblocks == 0 || mp->m_sb.sb_rextsize == 0 ||
> - (ip->i_d.di_extsize % mp->m_sb.sb_rextsize))
> + (ip->i_extsize % mp->m_sb.sb_rextsize))
> return -EINVAL;
> }
>
> @@ -1381,7 +1381,7 @@ xfs_ioctl_setattr_check_extsize(
> xfs_fsblock_t extsize_fsb;
>
> if (S_ISREG(VFS_I(ip)->i_mode) && ip->i_df.if_nextents &&
> - ((ip->i_d.di_extsize << mp->m_sb.sb_blocklog) != fa->fsx_extsize))
> + ((ip->i_extsize << mp->m_sb.sb_blocklog) != fa->fsx_extsize))
> return -EINVAL;
>
> if (fa->fsx_extsize == 0)
> @@ -1569,9 +1569,9 @@ xfs_ioctl_setattr(
> * are set on the inode then unconditionally clear the extent size hint.
> */
> if (ip->i_d.di_flags & (XFS_DIFLAG_EXTSIZE | XFS_DIFLAG_EXTSZINHERIT))
> - ip->i_d.di_extsize = fa->fsx_extsize >> mp->m_sb.sb_blocklog;
> + ip->i_extsize = fa->fsx_extsize >> mp->m_sb.sb_blocklog;
> else
> - ip->i_d.di_extsize = 0;
> + 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 >>
> diff --git a/fs/xfs/xfs_itable.c b/fs/xfs/xfs_itable.c
> index 7af144500bbfdb..b0f0c19fd7822e 100644
> --- a/fs/xfs/xfs_itable.c
> +++ b/fs/xfs/xfs_itable.c
> @@ -103,7 +103,7 @@ xfs_bulkstat_one_int(
> buf->bs_mode = inode->i_mode;
>
> buf->bs_xflags = xfs_ip2xflags(ip);
> - buf->bs_extsize_blks = dic->di_extsize;
> + buf->bs_extsize_blks = ip->i_extsize;
> buf->bs_extents = xfs_ifork_nextents(&ip->i_df);
> xfs_bulkstat_health(ip, buf);
> buf->bs_aextents = xfs_ifork_nextents(ip->i_afp);
> --
> 2.26.2
>
