xfs: miscellaneous verifier magic value fixups

Most buffer verifiers have hardcoded magic value checks
conditionalized on the version of the filesystem. The magic value
field of the verifier structure facilitates abstraction of some of
this code. Populate the ->magic field of various verifiers to take
advantage of this abstraction. No functional changes.

Signed-off-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>

1 files changed, 5 insertions, 5 deletions

diff --git a/fs/xfs/libxfs/xfs_dir2_node.c b/fs/xfs/libxfs/xfs_dir2_node.c
index f1bb3434f51c..3b03703c5c3d 100644
--- a/fs/xfs/libxfs/xfs_dir2_node.c
+++ b/fs/xfs/libxfs/xfs_dir2_node.c
@@ -87,20 +87,18 @@ xfs_dir3_free_verify(
         struct xfs_mount        *mp = bp->b_target->bt_mount;
         struct xfs_dir2_free_hdr *hdr = bp->b_addr;
 
+        if (!xfs_verify_magic(bp, hdr->magic))
+                return __this_address;
+
         if (xfs_sb_version_hascrc(&mp->m_sb)) {
                 struct xfs_dir3_blk_hdr *hdr3 = bp->b_addr;
 
-                if (hdr3->magic != cpu_to_be32(XFS_DIR3_FREE_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 (hdr->magic != cpu_to_be32(XFS_DIR2_FREE_MAGIC))
-                        return __this_address;
         }
 
         /* XXX: should bounds check the xfs_dir3_icfree_hdr here */
@@ -151,6 +149,8 @@ xfs_dir3_free_write_verify(
 
 const struct xfs_buf_ops xfs_dir3_free_buf_ops = {
         .name = "xfs_dir3_free",
+        .magic = { cpu_to_be32(XFS_DIR2_FREE_MAGIC),
+                   cpu_to_be32(XFS_DIR3_FREE_MAGIC) },
         .verify_read = xfs_dir3_free_read_verify,
         .verify_write = xfs_dir3_free_write_verify,
         .verify_struct = xfs_dir3_free_verify,