xfs: replace xfs_sb_version checks with feature flag checks

[linux-2.6-microblaze.git] / fs / xfs / scrub / common.c

diff --git a/fs/xfs/scrub/common.c b/fs/xfs/scrub/common.c
index 0ef96ed..26e38b5 100644 (file)
--- a/fs/xfs/scrub/common.c
+++ b/fs/xfs/scrub/common.c
@@ -324,7 +324,7 @@ struct xchk_rmap_ownedby_info {
 STATIC int
 xchk_count_rmap_ownedby_irec(
        struct xfs_btree_cur            *cur,
-       struct xfs_rmap_irec            *rec,
+       const struct xfs_rmap_irec      *rec,
        void                            *priv)
 {
        struct xchk_rmap_ownedby_info   *sroi = priv;
@@ -414,8 +414,6 @@ xchk_ag_read_headers(
        if (!sa->pag)
                return -ENOENT;
 
-       sa->agno = agno;
-
        error = xfs_ialloc_read_agi(mp, sc->tp, agno, &sa->agi_bp);
        if (error && want_ag_read_header_failure(sc, XFS_SCRUB_TYPE_AGI))
                return error;
@@ -531,7 +529,6 @@ xchk_ag_free(
                xfs_perag_put(sa->pag);
                sa->pag = NULL;
        }
-       sa->agno = NULLAGNUMBER;
 }
 
 /*
@@ -832,7 +829,7 @@ xchk_metadata_inode_forks(
                return error;
 
        /* Look for incorrect shared blocks. */
-       if (xfs_sb_version_hasreflink(&sc->mp->m_sb)) {
+       if (xfs_has_reflink(sc->mp)) {
                error = xfs_reflink_inode_has_shared_extents(sc->tp, sc->ip,
                                &shared);
                if (!xchk_fblock_process_error(sc, XFS_DATA_FORK, 0,