1 files changed, 7 insertions, 5 deletions

diff --git a/fs/xfs/libxfs/xfs_dir2_data.c b/fs/xfs/libxfs/xfs_dir2_data.c
index 01162c62ec8f..b7b9ce002cb9 100644
--- a/fs/xfs/libxfs/xfs_dir2_data.c
+++ b/fs/xfs/libxfs/xfs_dir2_data.c
@@ -252,18 +252,16 @@ xfs_dir3_data_verify(
         struct xfs_mount        *mp = bp->b_target->bt_mount;
         struct xfs_dir3_blk_hdr *hdr3 = bp->b_addr;
 
+        if (!xfs_verify_magic(bp, hdr3->magic))
+                return __this_address;
+
         if (xfs_sb_version_hascrc(&mp->m_sb)) {
-                if (hdr3->magic != cpu_to_be32(XFS_DIR3_DATA_MAGIC))
-                        return __this_address;
                 if (!uuid_equal(&hdr3->uuid, &mp->m_sb.sb_meta_uuid))
                         return __this_address;
                 if (be64_to_cpu(hdr3->blkno) != bp->b_bn)
                         return __this_address;
                 if (!xfs_log_check_lsn(mp, be64_to_cpu(hdr3->lsn)))
                         return __this_address;
-        } else {
-                if (hdr3->magic != cpu_to_be32(XFS_DIR2_DATA_MAGIC))
-                        return __this_address;
         }
         return __xfs_dir3_data_check(NULL, bp);
 }
@@ -339,6 +337,8 @@ xfs_dir3_data_write_verify(
 
 const struct xfs_buf_ops xfs_dir3_data_buf_ops = {
         .name = "xfs_dir3_data",
+        .magic = { cpu_to_be32(XFS_DIR2_DATA_MAGIC),
+                   cpu_to_be32(XFS_DIR3_DATA_MAGIC) },
         .verify_read = xfs_dir3_data_read_verify,
         .verify_write = xfs_dir3_data_write_verify,
         .verify_struct = xfs_dir3_data_verify,
@@ -346,6 +346,8 @@ const struct xfs_buf_ops xfs_dir3_data_buf_ops = {
 
 static const struct xfs_buf_ops xfs_dir3_data_reada_buf_ops = {
         .name = "xfs_dir3_data_reada",
+        .magic = { cpu_to_be32(XFS_DIR2_DATA_MAGIC),
+                   cpu_to_be32(XFS_DIR3_DATA_MAGIC) },
         .verify_read = xfs_dir3_data_reada_verify,
         .verify_write = xfs_dir3_data_write_verify,
 };