From 35244670240fb0538dd09381d015e06b416e7d8c Mon Sep 17 00:00:00 2001 From: "Darrick J. Wong" Date: Mon, 9 Jan 2017 20:16:33 -0600 Subject: [PATCH] libxfs: remove unnecessary hascrc test in btree verifiers 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 Reviewed-by: Christoph Hellwig Signed-off-by: Eric Sandeen --- libxfs/xfs_alloc_btree.c | 4 ---- libxfs/xfs_ialloc_btree.c | 2 -- 2 files changed, 6 deletions(-) diff --git a/libxfs/xfs_alloc_btree.c b/libxfs/xfs_alloc_btree.c index f993b87de..ff4bae420 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 8ccabcc3c..7bf6040cc 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 */ -- 2.47.2