On Thursday, March 12, 2020 7:52 PM Christoph Hellwig wrote:
> Add a new wrapper to check if a file system supports the newer large
> dinode format. Previously we uses xfs_sb_version_hascrc for that,
> which is technically correct but a little confusing to read.
>
I don't see any logical issues.
Reviewed-by: Chandan Rajendra <chandanrlinux@xxxxxxxxx>
> Signed-off-by: Christoph Hellwig <hch@xxxxxx>
> ---
> fs/xfs/libxfs/xfs_format.h | 5 +++++
> fs/xfs/libxfs/xfs_ialloc.c | 4 ++--
> fs/xfs/libxfs/xfs_inode_buf.c | 12 ++++++++----
> fs/xfs/libxfs/xfs_trans_resv.c | 2 +-
> fs/xfs/xfs_buf_item.c | 2 +-
> fs/xfs/xfs_log_recover.c | 2 +-
> 6 files changed, 18 insertions(+), 9 deletions(-)
>
> diff --git a/fs/xfs/libxfs/xfs_format.h b/fs/xfs/libxfs/xfs_format.h
> index cd814f99da28..a28bf6a978ad 100644
> --- a/fs/xfs/libxfs/xfs_format.h
> +++ b/fs/xfs/libxfs/xfs_format.h
> @@ -497,6 +497,11 @@ static inline bool xfs_sb_version_hascrc(struct xfs_sb *sbp)
> return XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_5;
> }
>
> +static inline bool xfs_sb_version_has_large_dinode(struct xfs_sb *sbp)
> +{
> + return XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_5;
> +}
> +
> static inline bool xfs_sb_version_has_pquotino(struct xfs_sb *sbp)
> {
> return XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_5;
> diff --git a/fs/xfs/libxfs/xfs_ialloc.c b/fs/xfs/libxfs/xfs_ialloc.c
> index b4a404278935..6adffaa68fb8 100644
> --- a/fs/xfs/libxfs/xfs_ialloc.c
> +++ b/fs/xfs/libxfs/xfs_ialloc.c
> @@ -304,7 +304,7 @@ xfs_ialloc_inode_init(
> * That means for v3 inode we log the entire buffer rather than just the
> * inode cores.
> */
> - if (xfs_sb_version_hascrc(&mp->m_sb)) {
> + if (xfs_sb_version_has_large_dinode(&mp->m_sb)) {
> version = 3;
> ino = XFS_AGINO_TO_INO(mp, agno, XFS_AGB_TO_AGINO(mp, agbno));
>
> @@ -2872,7 +2872,7 @@ xfs_ialloc_setup_geometry(
> * cannot change the behavior.
> */
> igeo->inode_cluster_size_raw = XFS_INODE_BIG_CLUSTER_SIZE;
> - if (xfs_sb_version_hascrc(&mp->m_sb)) {
> + if (xfs_sb_version_has_large_dinode(&mp->m_sb)) {
> int new_size = igeo->inode_cluster_size_raw;
>
> new_size *= mp->m_sb.sb_inodesize / XFS_DINODE_MIN_SIZE;
> diff --git a/fs/xfs/libxfs/xfs_inode_buf.c b/fs/xfs/libxfs/xfs_inode_buf.c
> index 17e88a8c8353..a5aa2f220c28 100644
> --- a/fs/xfs/libxfs/xfs_inode_buf.c
> +++ b/fs/xfs/libxfs/xfs_inode_buf.c
> @@ -44,14 +44,18 @@ xfs_inobp_check(
> }
> #endif
>
> +/*
> + * v4 and earlier file systems only support the small dinode, and must use the
> + * v1 or v2 inode formats. v5 file systems support a larger dinode, and must
> + * use the v3 inode format.
> + */
> bool
> xfs_dinode_good_version(
> struct xfs_mount *mp,
> __u8 version)
> {
> - if (xfs_sb_version_hascrc(&mp->m_sb))
> + if (xfs_sb_version_has_large_dinode(&mp->m_sb))
> return version == 3;
> -
> return version == 1 || version == 2;
> }
>
> @@ -454,7 +458,7 @@ xfs_dinode_verify(
>
> /* Verify v3 integrity information first */
> if (dip->di_version >= 3) {
> - if (!xfs_sb_version_hascrc(&mp->m_sb))
> + if (!xfs_sb_version_has_large_dinode(&mp->m_sb))
> return __this_address;
> if (!xfs_verify_cksum((char *)dip, mp->m_sb.sb_inodesize,
> XFS_DINODE_CRC_OFF))
> @@ -629,7 +633,7 @@ xfs_iread(
>
> /* shortcut IO on inode allocation if possible */
> if ((iget_flags & XFS_IGET_CREATE) &&
> - xfs_sb_version_hascrc(&mp->m_sb) &&
> + xfs_sb_version_has_large_dinode(&mp->m_sb) &&
> !(mp->m_flags & XFS_MOUNT_IKEEP)) {
> VFS_I(ip)->i_generation = prandom_u32();
> ip->i_d.di_version = 3;
> diff --git a/fs/xfs/libxfs/xfs_trans_resv.c b/fs/xfs/libxfs/xfs_trans_resv.c
> index 7a9c04920505..294e23d47912 100644
> --- a/fs/xfs/libxfs/xfs_trans_resv.c
> +++ b/fs/xfs/libxfs/xfs_trans_resv.c
> @@ -187,7 +187,7 @@ xfs_calc_inode_chunk_res(
> XFS_FSB_TO_B(mp, 1));
> if (alloc) {
> /* icreate tx uses ordered buffers */
> - if (xfs_sb_version_hascrc(&mp->m_sb))
> + if (xfs_sb_version_has_large_dinode(&mp->m_sb))
> return res;
> size = XFS_FSB_TO_B(mp, 1);
> }
> diff --git a/fs/xfs/xfs_buf_item.c b/fs/xfs/xfs_buf_item.c
> index 663810e6cd59..d004ae3455d7 100644
> --- a/fs/xfs/xfs_buf_item.c
> +++ b/fs/xfs/xfs_buf_item.c
> @@ -345,7 +345,7 @@ xfs_buf_item_format(
> * occurs during recovery.
> */
> if (bip->bli_flags & XFS_BLI_INODE_BUF) {
> - if (xfs_sb_version_hascrc(&lip->li_mountp->m_sb) ||
> + if (xfs_sb_version_has_large_dinode(&lip->li_mountp->m_sb) ||
> !((bip->bli_flags & XFS_BLI_INODE_ALLOC_BUF) &&
> xfs_log_item_in_current_chkpt(lip)))
> bip->__bli_format.blf_flags |= XFS_BLF_INODE_BUF;
> diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
> index 6abc0863c9c3..e5e976b5cc11 100644
> --- a/fs/xfs/xfs_log_recover.c
> +++ b/fs/xfs/xfs_log_recover.c
> @@ -2997,7 +2997,7 @@ xlog_recover_inode_pass2(
> * superblock flag to determine whether we need to look at di_flushiter
> * to skip replay when the on disk inode is newer than the log one
> */
> - if (!xfs_sb_version_hascrc(&mp->m_sb) &&
> + if (!xfs_sb_version_has_large_dinode(&mp->m_sb) &&
> ldip->di_flushiter < be16_to_cpu(dip->di_flushiter)) {
> /*
> * Deal with the wrap case, DI_MAX_FLUSH is less
>
--
chandan
