On Sat, Jun 20, 2020 at 09:10:54AM +0200, Christoph Hellwig wrote:
> In preparation of removing the historic icinode struct, move the
> flushiter field into the containing xfs_inode structure.
>
> Signed-off-by: Christoph Hellwig <hch@xxxxxx>
Reviewed-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
--D
> ---
> fs/xfs/libxfs/xfs_inode_buf.c | 4 ++--
> fs/xfs/libxfs/xfs_inode_buf.h | 1 -
> fs/xfs/xfs_icache.c | 2 +-
> fs/xfs/xfs_inode.c | 19 +++++++++----------
> fs/xfs/xfs_inode.h | 1 +
> fs/xfs/xfs_inode_item.c | 2 +-
> 6 files changed, 14 insertions(+), 15 deletions(-)
>
> diff --git a/fs/xfs/libxfs/xfs_inode_buf.c b/fs/xfs/libxfs/xfs_inode_buf.c
> index 860e35611e001a..03bd7cdd0ddc81 100644
> --- a/fs/xfs/libxfs/xfs_inode_buf.c
> +++ b/fs/xfs/libxfs/xfs_inode_buf.c
> @@ -205,7 +205,7 @@ xfs_inode_from_disk(
> * inode. If the inode is unused, mode is zero and we shouldn't mess
> * with the unitialized part of it.
> */
> - to->di_flushiter = be16_to_cpu(from->di_flushiter);
> + ip->i_flushiter = be16_to_cpu(from->di_flushiter);
> inode->i_generation = be32_to_cpu(from->di_gen);
> inode->i_mode = be16_to_cpu(from->di_mode);
> if (!inode->i_mode)
> @@ -329,7 +329,7 @@ xfs_inode_to_disk(
> to->di_flushiter = 0;
> } else {
> to->di_version = 2;
> - to->di_flushiter = cpu_to_be16(from->di_flushiter);
> + to->di_flushiter = cpu_to_be16(ip->i_flushiter);
> }
> }
>
> diff --git a/fs/xfs/libxfs/xfs_inode_buf.h b/fs/xfs/libxfs/xfs_inode_buf.h
> index 663a97fa78f05f..8cc96f2766ff4f 100644
> --- a/fs/xfs/libxfs/xfs_inode_buf.h
> +++ b/fs/xfs/libxfs/xfs_inode_buf.h
> @@ -16,7 +16,6 @@ struct xfs_dinode;
> * format specific structures at the appropriate time.
> */
> struct xfs_icdinode {
> - uint16_t di_flushiter; /* incremented on flush */
> 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_icache.c b/fs/xfs/xfs_icache.c
> index ad01e694f3ab9b..e6b40f7035aa5a 100644
> --- a/fs/xfs/xfs_icache.c
> +++ b/fs/xfs/xfs_icache.c
> @@ -521,7 +521,7 @@ xfs_iget_cache_miss(
> * simply build the new inode core with a random generation number.
> *
> * For version 4 (and older) superblocks, log recovery is dependent on
> - * the di_flushiter field being initialised from the current on-disk
> + * the i_flushiter field being initialised from the current on-disk
> * value and hence we must also read the inode off disk even when
> * initializing new inodes.
> */
> diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
> index f1893824cd4e2f..5e0336e0dbae44 100644
> --- a/fs/xfs/xfs_inode.c
> +++ b/fs/xfs/xfs_inode.c
> @@ -3765,16 +3765,15 @@ xfs_iflush_int(
> }
>
> /*
> - * Inode item log recovery for v2 inodes are dependent on the
> - * di_flushiter count for correct sequencing. We bump the flush
> - * iteration count so we can detect flushes which postdate a log record
> - * during recovery. This is redundant as we now log every change and
> - * hence this can't happen but we need to still do it to ensure
> - * backwards compatibility with old kernels that predate logging all
> - * inode changes.
> + * Inode item log recovery for v2 inodes are dependent on the flushiter
> + * count for correct sequencing. We bump the flush iteration count so
> + * we can detect flushes which postdate a log record during recovery.
> + * This is redundant as we now log every change and hence this can't
> + * happen but we need to still do it to ensure backwards compatibility
> + * with old kernels that predate logging all inode changes.
> */
> if (!xfs_sb_version_has_v3inode(&mp->m_sb))
> - ip->i_d.di_flushiter++;
> + ip->i_flushiter++;
>
> /*
> * If there are inline format data / attr forks attached to this inode,
> @@ -3795,8 +3794,8 @@ xfs_iflush_int(
> xfs_inode_to_disk(ip, dip, iip->ili_item.li_lsn);
>
> /* Wrap, we never let the log put out DI_MAX_FLUSH */
> - if (ip->i_d.di_flushiter == DI_MAX_FLUSH)
> - ip->i_d.di_flushiter = 0;
> + if (ip->i_flushiter == DI_MAX_FLUSH)
> + ip->i_flushiter = 0;
>
> xfs_iflush_fork(ip, dip, iip, XFS_DATA_FORK);
> if (XFS_IFORK_Q(ip))
> diff --git a/fs/xfs/xfs_inode.h b/fs/xfs/xfs_inode.h
> index 2cdb7b6b298852..581618ea1156da 100644
> --- a/fs/xfs/xfs_inode.h
> +++ b/fs/xfs/xfs_inode.h
> @@ -59,6 +59,7 @@ typedef struct xfs_inode {
> uint32_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 */
> + uint16_t i_flushiter; /* incremented on flush */
>
> 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 ab0d8cf8ceb6ab..8357fe37d3eb8a 100644
> --- a/fs/xfs/xfs_inode_item.c
> +++ b/fs/xfs/xfs_inode_item.c
> @@ -351,7 +351,7 @@ xfs_inode_to_log_dinode(
> to->di_flushiter = 0;
> } else {
> to->di_version = 2;
> - to->di_flushiter = from->di_flushiter;
> + to->di_flushiter = ip->i_flushiter;
> }
> }
>
> --
> 2.26.2
>
