| Message ID | 147830450463.26713.17853370356150959278.stgit@birch.djwong.org (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Fri, Nov 04, 2016 at 05:08:24PM -0700, Darrick J. Wong wrote: > xfs_btree_sblock_v5hdr_verify already checks _hascrc, so we can > remove it from the verifier functions. For whatever reason this > change made it into the kernel but not xfsprogs. Looks fine, Reviewed-by: Christoph Hellwig <hch@lst.de> -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/libxfs/xfs_alloc_btree.c b/libxfs/xfs_alloc_btree.c index f993b87..ff4bae4 100644 --- a/libxfs/xfs_alloc_btree.c +++ b/libxfs/xfs_alloc_btree.c @@ -278,8 +278,6 @@ xfs_allocbt_verify( level = be16_to_cpu(block->bb_level); switch (block->bb_magic) { case cpu_to_be32(XFS_ABTB_CRC_MAGIC): - if (!xfs_sb_version_hascrc(&mp->m_sb)) - return false; if (!xfs_btree_sblock_v5hdr_verify(bp)) return false; /* fall through */ @@ -291,8 +289,6 @@ xfs_allocbt_verify( return false; break; case cpu_to_be32(XFS_ABTC_CRC_MAGIC): - if (!xfs_sb_version_hascrc(&mp->m_sb)) - return false; if (!xfs_btree_sblock_v5hdr_verify(bp)) return false; /* fall through */ diff --git a/libxfs/xfs_ialloc_btree.c b/libxfs/xfs_ialloc_btree.c index 8ccabcc..7bf6040 100644 --- a/libxfs/xfs_ialloc_btree.c +++ b/libxfs/xfs_ialloc_btree.c @@ -225,8 +225,6 @@ xfs_inobt_verify( switch (block->bb_magic) { case cpu_to_be32(XFS_IBT_CRC_MAGIC): case cpu_to_be32(XFS_FIBT_CRC_MAGIC): - if (!xfs_sb_version_hascrc(&mp->m_sb)) - return false; if (!xfs_btree_sblock_v5hdr_verify(bp)) return false; /* fall through */
xfs_btree_sblock_v5hdr_verify already checks _hascrc, so we can remove it from the verifier functions. For whatever reason this change made it into the kernel but not xfsprogs. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> --- libxfs/xfs_alloc_btree.c | 4 ---- libxfs/xfs_ialloc_btree.c | 2 -- 2 files changed, 6 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html