1 files changed, 6 insertions, 7 deletions

diff --git a/fs/xfs/libxfs/xfs_bmap_btree.c b/fs/xfs/libxfs/xfs_bmap_btree.c
index cdb74d2e2a43..aff82ed112c9 100644
--- a/fs/xfs/libxfs/xfs_bmap_btree.c
+++ b/fs/xfs/libxfs/xfs_bmap_btree.c
@@ -416,8 +416,10 @@ xfs_bmbt_verify(
         xfs_failaddr_t          fa;
         unsigned int            level;
 
-        switch (block->bb_magic) {
-        case cpu_to_be32(XFS_BMAP_CRC_MAGIC):
+        if (!xfs_verify_magic(bp, block->bb_magic))
+                return __this_address;
+
+        if (xfs_sb_version_hascrc(&mp->m_sb)) {
                 /*
                  * XXX: need a better way of verifying the owner here. Right now
                  * just make sure there has been one set.
@@ -425,11 +427,6 @@ xfs_bmbt_verify(
                 fa = xfs_btree_lblock_v5hdr_verify(bp, XFS_RMAP_OWN_UNKNOWN);
                 if (fa)
                         return fa;
-                /* fall through */
-        case cpu_to_be32(XFS_BMAP_MAGIC):
-                break;
-        default:
-                return __this_address;
         }
 
         /*
@@ -481,6 +478,8 @@ xfs_bmbt_write_verify(
 
 const struct xfs_buf_ops xfs_bmbt_buf_ops = {
         .name = "xfs_bmbt",
+        .magic = { cpu_to_be32(XFS_BMAP_MAGIC),
+                   cpu_to_be32(XFS_BMAP_CRC_MAGIC) },
         .verify_read = xfs_bmbt_read_verify,
         .verify_write = xfs_bmbt_write_verify,
         .verify_struct = xfs_bmbt_verify,