1 files changed, 5 insertions, 6 deletions

diff --git a/fs/xfs/libxfs/xfs_da_btree.c b/fs/xfs/libxfs/xfs_da_btree.c
index 355322688c9f..e02d2f407e12 100644
--- a/fs/xfs/libxfs/xfs_da_btree.c
+++ b/fs/xfs/libxfs/xfs_da_btree.c
@@ -129,21 +129,18 @@ xfs_da3_node_verify(
 
         ops->node_hdr_from_disk(&ichdr, hdr);
 
+        if (!xfs_verify_magic(bp, hdr->hdr.info.magic))
+                return __this_address;
+
         if (xfs_sb_version_hascrc(&mp->m_sb)) {
                 struct xfs_da3_node_hdr *hdr3 = bp->b_addr;
 
-                if (hdr3->info.hdr.magic != cpu_to_be16(XFS_DA3_NODE_MAGIC))
-                        return __this_address;
-
                 if (!uuid_equal(&hdr3->info.uuid, &mp->m_sb.sb_meta_uuid))
                         return __this_address;
                 if (be64_to_cpu(hdr3->info.blkno) != bp->b_bn)
                         return __this_address;
                 if (!xfs_log_check_lsn(mp, be64_to_cpu(hdr3->info.lsn)))
                         return __this_address;
-        } else {
-                if (hdr->hdr.info.magic != cpu_to_be16(XFS_DA_NODE_MAGIC))
-                        return __this_address;
         }
         if (ichdr.level == 0)
                 return __this_address;
@@ -257,6 +254,8 @@ xfs_da3_node_verify_struct(
 
 const struct xfs_buf_ops xfs_da3_node_buf_ops = {
         .name = "xfs_da3_node",
+        .magic = { cpu_to_be16(XFS_DA_NODE_MAGIC),
+                   cpu_to_be16(XFS_DA3_NODE_MAGIC) },
         .verify_read = xfs_da3_node_read_verify,
         .verify_write = xfs_da3_node_write_verify,
         .verify_struct = xfs_da3_node_verify_struct,