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, 8 insertions, 4 deletions

diff --git a/fs/xfs/libxfs/xfs_alloc.c b/fs/xfs/libxfs/xfs_alloc.c
index 48aab07e7138..bc3367b8b7bb 100644
--- a/fs/xfs/libxfs/xfs_alloc.c
+++ b/fs/xfs/libxfs/xfs_alloc.c
@@ -568,9 +568,9 @@ xfs_agfl_verify(
         if (!xfs_sb_version_hascrc(&mp->m_sb))
                 return NULL;
 
-        if (!uuid_equal(&agfl->agfl_uuid, &mp->m_sb.sb_meta_uuid))
+        if (!xfs_verify_magic(bp, agfl->agfl_magicnum))
                 return __this_address;
-        if (agfl->agfl_magicnum != cpu_to_be32(XFS_AGFL_MAGIC))
+        if (!uuid_equal(&agfl->agfl_uuid, &mp->m_sb.sb_meta_uuid))
                 return __this_address;
         /*
          * during growfs operations, the perag is not fully initialised,
@@ -643,6 +643,7 @@ xfs_agfl_write_verify(
 
 const struct xfs_buf_ops xfs_agfl_buf_ops = {
         .name = "xfs_agfl",
+        .magic = { cpu_to_be32(XFS_AGFL_MAGIC), cpu_to_be32(XFS_AGFL_MAGIC) },
         .verify_read = xfs_agfl_read_verify,
         .verify_write = xfs_agfl_write_verify,
         .verify_struct = xfs_agfl_verify,
@@ -2587,8 +2588,10 @@ xfs_agf_verify(
                         return __this_address;
         }
 
-        if (!(agf->agf_magicnum == cpu_to_be32(XFS_AGF_MAGIC) &&
-              XFS_AGF_GOOD_VERSION(be32_to_cpu(agf->agf_versionnum)) &&
+        if (!xfs_verify_magic(bp, agf->agf_magicnum))
+                return __this_address;
+
+        if (!(XFS_AGF_GOOD_VERSION(be32_to_cpu(agf->agf_versionnum)) &&
               be32_to_cpu(agf->agf_freeblks) <= be32_to_cpu(agf->agf_length) &&
               be32_to_cpu(agf->agf_flfirst) < xfs_agfl_size(mp) &&
               be32_to_cpu(agf->agf_fllast) < xfs_agfl_size(mp) &&
@@ -2670,6 +2673,7 @@ xfs_agf_write_verify(
 
 const struct xfs_buf_ops xfs_agf_buf_ops = {
         .name = "xfs_agf",
+        .magic = { cpu_to_be32(XFS_AGF_MAGIC), cpu_to_be32(XFS_AGF_MAGIC) },
         .verify_read = xfs_agf_read_verify,
         .verify_write = xfs_agf_write_verify,
         .verify_struct = xfs_agf_verify,