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, 2 insertions, 1 deletions

diff --git a/fs/xfs/libxfs/xfs_refcount_btree.c b/fs/xfs/libxfs/xfs_refcount_btree.c
index d9eab657b63e..6f47ab876d90 100644
--- a/fs/xfs/libxfs/xfs_refcount_btree.c
+++ b/fs/xfs/libxfs/xfs_refcount_btree.c
@@ -209,7 +209,7 @@ xfs_refcountbt_verify(
         xfs_failaddr_t          fa;
         unsigned int            level;
 
-        if (block->bb_magic != cpu_to_be32(XFS_REFC_CRC_MAGIC))
+        if (!xfs_verify_magic(bp, block->bb_magic))
                 return __this_address;
 
         if (!xfs_sb_version_hasreflink(&mp->m_sb))
@@ -264,6 +264,7 @@ xfs_refcountbt_write_verify(
 
 const struct xfs_buf_ops xfs_refcountbt_buf_ops = {
         .name                   = "xfs_refcountbt",
+        .magic                  = { 0, cpu_to_be32(XFS_REFC_CRC_MAGIC) },
         .verify_read            = xfs_refcountbt_read_verify,
         .verify_write           = xfs_refcountbt_write_verify,
         .verify_struct          = xfs_refcountbt_verify,