On Fri, May 01, 2020 at 10:14:19AM +0200, Christoph Hellwig wrote:
> There is not much point in the xfs_iread function, as it has a single
> caller and not a whole lot of code. Move it into the only caller,
> and trim down the overdocumentation to just documenting the important
> "why" instead of a lot of redundant "what".
>
> Signed-off-by: Christoph Hellwig <hch@xxxxxx>
> ---
> fs/xfs/libxfs/xfs_inode_buf.c | 73 -----------------------------------
> fs/xfs/libxfs/xfs_inode_buf.h | 2 -
> fs/xfs/xfs_icache.c | 33 +++++++++++++++-
> 3 files changed, 32 insertions(+), 76 deletions(-)
>
...
> diff --git a/fs/xfs/xfs_icache.c b/fs/xfs/xfs_icache.c
> index 8bf1d15be3f6a..dd757c6614956 100644
> --- a/fs/xfs/xfs_icache.c
> +++ b/fs/xfs/xfs_icache.c
...
> @@ -510,10 +511,40 @@ xfs_iget_cache_miss(
> if (!ip)
> return -ENOMEM;
>
> - error = xfs_iread(mp, tp, ip, flags);
> + error = xfs_imap(mp, tp, ip->i_ino, &ip->i_imap, flags);
> if (error)
> goto out_destroy;
>
> + /*
> + * For version 5 superblocks, if we are initialising a new inode and we
> + * are not utilising the XFS_MOUNT_IKEEP inode cluster mode, we can
> + * simple build the new inode core with a random generation number.
I'm assuming the original comment meant to say "simply" here instead of
"simple." Otherwise looks good to me:
Reviewed-by: Brian Foster <bfoster@xxxxxxxxxx>
> + *
> + * For version 4 (and older) superblocks, log recovery is dependent on
> + * the di_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.
> + */
> + if (xfs_sb_version_has_v3inode(&mp->m_sb) &&
> + (flags & XFS_IGET_CREATE) && !(mp->m_flags & XFS_MOUNT_IKEEP)) {
> + VFS_I(ip)->i_generation = prandom_u32();
> + } else {
> + struct xfs_dinode *dip;
> + struct xfs_buf *bp;
> +
> + error = xfs_imap_to_bp(mp, tp, &ip->i_imap, &dip, &bp, 0, flags);
> + if (error)
> + goto out_destroy;
> +
> + error = xfs_inode_from_disk(ip, dip);
> + if (!error)
> + xfs_buf_set_ref(bp, XFS_INO_REF);
> + xfs_trans_brelse(tp, bp);
> +
> + if (error)
> + goto out_destroy;
> + }
> +
> if (!xfs_inode_verify_forks(ip)) {
> error = -EFSCORRUPTED;
> goto out_destroy;
> --
> 2.26.2
>
