On Sat, Jun 20, 2020 at 09:11:02AM +0200, Christoph Hellwig wrote:
> Move the di_dmstate into struct xfs_inode, and thus finally kill of
> the xfs_icdinode structure.
>
> Signed-off-by: Christoph Hellwig <hch@xxxxxx>
Hooray, it's gone finally...
Reviewed-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
--D
> ---
> fs/xfs/libxfs/xfs_inode_buf.c | 6 ++----
> fs/xfs/libxfs/xfs_inode_buf.h | 10 ----------
> fs/xfs/xfs_inode.c | 2 +-
> fs/xfs/xfs_inode.h | 3 +--
> fs/xfs/xfs_inode_item.c | 3 +--
> fs/xfs/xfs_itable.c | 3 ---
> 6 files changed, 5 insertions(+), 22 deletions(-)
>
> diff --git a/fs/xfs/libxfs/xfs_inode_buf.c b/fs/xfs/libxfs/xfs_inode_buf.c
> index d361803102d0e1..e4e96a47e0bab6 100644
> --- a/fs/xfs/libxfs/xfs_inode_buf.c
> +++ b/fs/xfs/libxfs/xfs_inode_buf.c
> @@ -185,7 +185,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;
> @@ -247,7 +246,7 @@ xfs_inode_from_disk(
> ip->i_extsize = be32_to_cpu(from->di_extsize);
> ip->i_forkoff = from->di_forkoff;
> ip->i_dmevmask = be32_to_cpu(from->di_dmevmask);
> - to->di_dmstate = be16_to_cpu(from->di_dmstate);
> + ip->i_dmstate = be16_to_cpu(from->di_dmstate);
> ip->i_diflags = be16_to_cpu(from->di_flags);
>
> if (xfs_sb_version_has_v3inode(&ip->i_mount->m_sb)) {
> @@ -282,7 +281,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);
> @@ -313,7 +311,7 @@ xfs_inode_to_disk(
> to->di_forkoff = ip->i_forkoff;
> to->di_aformat = xfs_ifork_format(ip->i_afp);
> to->di_dmevmask = cpu_to_be32(ip->i_dmevmask);
> - to->di_dmstate = cpu_to_be16(from->di_dmstate);
> + to->di_dmstate = cpu_to_be16(ip->i_dmstate);
> to->di_flags = cpu_to_be16(ip->i_diflags);
>
> if (xfs_sb_version_has_v3inode(&ip->i_mount->m_sb)) {
> diff --git a/fs/xfs/libxfs/xfs_inode_buf.h b/fs/xfs/libxfs/xfs_inode_buf.h
> index 0cfc1aaff6c6f3..834c8b3e917370 100644
> --- 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 {
> - uint16_t di_dmstate; /* DMIG state info */
> -};
> -
> /*
> * 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/xfs_inode.c b/fs/xfs/xfs_inode.c
> index db48c910c8d7b0..79436ed0b14e89 100644
> --- a/fs/xfs/xfs_inode.c
> +++ b/fs/xfs/xfs_inode.c
> @@ -834,7 +834,7 @@ xfs_ialloc(
>
> ip->i_extsize = 0;
> ip->i_dmevmask = 0;
> - ip->i_d.di_dmstate = 0;
> + ip->i_dmstate = 0;
> ip->i_diflags = 0;
>
> if (xfs_sb_version_has_v3inode(&mp->m_sb)) {
> diff --git a/fs/xfs/xfs_inode.h b/fs/xfs/xfs_inode.h
> index e64df2e7438aa0..f0537ead8bad90 100644
> --- a/fs/xfs/xfs_inode.h
> +++ b/fs/xfs/xfs_inode.h
> @@ -68,8 +68,7 @@ typedef struct xfs_inode {
> uint64_t i_diflags2; /* XFS_DIFLAG2_... */
> struct timespec64 i_crtime; /* time created */
> uint32_t i_dmevmask; /* DMIG event mask */
> -
> - struct xfs_icdinode i_d; /* most of ondisk inode */
> + uint16_t i_dmstate; /* DMIG state info */
>
> /* 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 9b7860025c497d..628f8190abddca 100644
> --- a/fs/xfs/xfs_inode_item.c
> +++ b/fs/xfs/xfs_inode_item.c
> @@ -301,7 +301,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;
> @@ -331,7 +330,7 @@ xfs_inode_to_log_dinode(
> to->di_forkoff = ip->i_forkoff;
> to->di_aformat = xfs_ifork_format(ip->i_afp);
> to->di_dmevmask = ip->i_dmevmask;
> - to->di_dmstate = from->di_dmstate;
> + to->di_dmstate = ip->i_dmstate;
> to->di_flags = ip->i_diflags;
>
> /* log a dummy value to ensure log structure is fully initialised */
> diff --git a/fs/xfs/xfs_itable.c b/fs/xfs/xfs_itable.c
> index 7945c6c4844940..cd1f09e57b9483 100644
> --- a/fs/xfs/xfs_itable.c
> +++ b/fs/xfs/xfs_itable.c
> @@ -58,7 +58,6 @@ xfs_bulkstat_one_int(
> xfs_ino_t ino,
> struct xfs_bstat_chunk *bc)
> {
> - struct xfs_icdinode *dic; /* dinode core info pointer */
> struct xfs_inode *ip; /* incore inode pointer */
> struct inode *inode;
> struct xfs_bulkstat *buf = bc->buf;
> @@ -79,8 +78,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.
> */
> --
> 2.26.2
>
