xfs: cross-reference inode btrees during scrub

Cross-reference the inode btrees with the other metadata when we
scrub the filesystem.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>

diff --git a/fs/xfs/scrub/agheader.c b/fs/xfs/scrub/agheader.c
index 1aba7c01cdd773d260dbaf575453804206609907..13ec76b783ad666c104364e2201664aedd26b685 100644 (file)
--- a/fs/xfs/scrub/agheader.c
+++ b/fs/xfs/scrub/agheader.c
@@ -122,6 +122,7 @@ xfs_scrub_superblock_xref(
                return;
 
        xfs_scrub_xref_is_used_space(sc, agbno, 1);
+       xfs_scrub_xref_is_not_inode_chunk(sc, agbno, 1);
 
        /* scrub teardown will take care of sc->sa for us */
 }
@@ -507,6 +508,7 @@ xfs_scrub_agf_xref(
        xfs_scrub_xref_is_used_space(sc, agbno, 1);
        xfs_scrub_agf_xref_freeblks(sc);
        xfs_scrub_agf_xref_cntbt(sc);
+       xfs_scrub_xref_is_not_inode_chunk(sc, agbno, 1);
 
        /* scrub teardown will take care of sc->sa for us */
 }
@@ -612,6 +614,7 @@ xfs_scrub_agfl_block_xref(
                return;
 
        xfs_scrub_xref_is_used_space(sc, agbno, 1);
+       xfs_scrub_xref_is_not_inode_chunk(sc, agbno, 1);
 }
 
 /* Scrub an AGFL block. */
@@ -666,6 +669,7 @@ xfs_scrub_agfl_xref(
                return;
 
        xfs_scrub_xref_is_used_space(sc, agbno, 1);
+       xfs_scrub_xref_is_not_inode_chunk(sc, agbno, 1);
 
        /*
         * Scrub teardown will take care of sc->sa for us.  Leave sc->sa
@@ -740,6 +744,27 @@ out:
 
 /* AGI */
 
+/* Check agi_count/agi_freecount */
+static inline void
+xfs_scrub_agi_xref_icounts(
+       struct xfs_scrub_context        *sc)
+{
+       struct xfs_agi                  *agi = XFS_BUF_TO_AGI(sc->sa.agi_bp);
+       xfs_agino_t                     icount;
+       xfs_agino_t                     freecount;
+       int                             error;
+
+       if (!sc->sa.ino_cur)
+               return;
+
+       error = xfs_ialloc_count_inodes(sc->sa.ino_cur, &icount, &freecount);
+       if (!xfs_scrub_should_check_xref(sc, &error, &sc->sa.ino_cur))
+               return;
+       if (be32_to_cpu(agi->agi_count) != icount ||
+           be32_to_cpu(agi->agi_freecount) != freecount)
+               xfs_scrub_block_xref_set_corrupt(sc, sc->sa.agi_bp);
+}
+
 /* Cross-reference with the other btrees. */
 STATIC void
 xfs_scrub_agi_xref(
@@ -759,6 +784,8 @@ xfs_scrub_agi_xref(
                return;
 
        xfs_scrub_xref_is_used_space(sc, agbno, 1);
+       xfs_scrub_xref_is_not_inode_chunk(sc, agbno, 1);
+       xfs_scrub_agi_xref_icounts(sc);
 
        /* scrub teardown will take care of sc->sa for us */
 }

diff --git a/fs/xfs/scrub/alloc.c b/fs/xfs/scrub/alloc.c
index 836b3c31c9510fb308d85a6319f7614d86e65931..0031014fbf9c24b6946bd9d4d519bf6aecbf3c0d 100644 (file)
--- a/fs/xfs/scrub/alloc.c
+++ b/fs/xfs/scrub/alloc.c
@@ -104,6 +104,7 @@ xfs_scrub_allocbt_xref(
                return;
 
        xfs_scrub_allocbt_xref_other(sc, agbno, len);
+       xfs_scrub_xref_is_not_inode_chunk(sc, agbno, len);
 }
 
 /* Scrub a bnobt/cntbt record. */

diff --git a/fs/xfs/scrub/bmap.c b/fs/xfs/scrub/bmap.c
index 7e8e239c2516003f50fd43861d6337be548ca82a..6f1d145d5fe72322243757e2a22571cdb4be25c1 100644 (file)
--- a/fs/xfs/scrub/bmap.c
+++ b/fs/xfs/scrub/bmap.c
@@ -138,6 +138,7 @@ xfs_scrub_bmap_extent_xref(
                return;
 
        xfs_scrub_xref_is_used_space(info->sc, agbno, len);
+       xfs_scrub_xref_is_not_inode_chunk(info->sc, agbno, len);
 
        xfs_scrub_ag_free(info->sc, &info->sc->sa);
 }

diff --git a/fs/xfs/scrub/ialloc.c b/fs/xfs/scrub/ialloc.c
index 45268941785abc9bfdb9ca4e47a1f8dc94da9079..bd7ba16421898ebc966bdaec12b25d7d0cc935bf 100644 (file)
--- a/fs/xfs/scrub/ialloc.c
+++ b/fs/xfs/scrub/ialloc.c
@@ -58,6 +58,35 @@ xfs_scrub_setup_ag_iallocbt(
 
 /* Inode btree scrubber. */
 
+/*
+ * If we're checking the finobt, cross-reference with the inobt.
+ * Otherwise we're checking the inobt; if there is an finobt, make sure
+ * we have a record or not depending on freecount.
+ */
+static inline void
+xfs_scrub_iallocbt_chunk_xref_other(
+       struct xfs_scrub_context        *sc,
+       struct xfs_inobt_rec_incore     *irec,
+       xfs_agino_t                     agino)
+{
+       struct xfs_btree_cur            **pcur;
+       bool                            has_irec;
+       int                             error;
+
+       if (sc->sm->sm_type == XFS_SCRUB_TYPE_FINOBT)
+               pcur = &sc->sa.ino_cur;
+       else
+               pcur = &sc->sa.fino_cur;
+       if (!(*pcur))
+               return;
+       error = xfs_ialloc_has_inode_record(*pcur, agino, agino, &has_irec);
+       if (!xfs_scrub_should_check_xref(sc, &error, pcur))
+               return;
+       if (((irec->ir_freecount > 0 && !has_irec) ||
+            (irec->ir_freecount == 0 && has_irec)))
+               xfs_scrub_btree_xref_set_corrupt(sc, *pcur, 0);
+}
+
 /* Cross-reference with the other btrees. */
 STATIC void
 xfs_scrub_iallocbt_chunk_xref(
@@ -71,6 +100,7 @@ xfs_scrub_iallocbt_chunk_xref(
                return;
 
        xfs_scrub_xref_is_used_space(sc, agbno, len);
+       xfs_scrub_iallocbt_chunk_xref_other(sc, irec, agino);
 }
 
 /* Is this chunk worth checking? */
@@ -352,3 +382,46 @@ xfs_scrub_finobt(
 {
        return xfs_scrub_iallocbt(sc, XFS_BTNUM_FINO);
 }
+
+/* See if an inode btree has (or doesn't have) an inode chunk record. */
+static inline void
+xfs_scrub_xref_inode_check(
+       struct xfs_scrub_context        *sc,
+       xfs_agblock_t                   agbno,
+       xfs_extlen_t                    len,
+       struct xfs_btree_cur            **icur,
+       bool                            should_have_inodes)
+{
+       bool                            has_inodes;
+       int                             error;
+
+       if (!(*icur))
+               return;
+
+       error = xfs_ialloc_has_inodes_at_extent(*icur, agbno, len, &has_inodes);
+       if (!xfs_scrub_should_check_xref(sc, &error, icur))
+               return;
+       if (has_inodes != should_have_inodes)
+               xfs_scrub_btree_xref_set_corrupt(sc, *icur, 0);
+}
+
+/* xref check that the extent is not covered by inodes */
+void
+xfs_scrub_xref_is_not_inode_chunk(
+       struct xfs_scrub_context        *sc,
+       xfs_agblock_t                   agbno,
+       xfs_extlen_t                    len)
+{
+       xfs_scrub_xref_inode_check(sc, agbno, len, &sc->sa.ino_cur, false);
+       xfs_scrub_xref_inode_check(sc, agbno, len, &sc->sa.fino_cur, false);
+}
+
+/* xref check that the extent is covered by inodes */
+void
+xfs_scrub_xref_is_inode_chunk(
+       struct xfs_scrub_context        *sc,
+       xfs_agblock_t                   agbno,
+       xfs_extlen_t                    len)
+{
+       xfs_scrub_xref_inode_check(sc, agbno, len, &sc->sa.ino_cur, true);
+}

diff --git a/fs/xfs/scrub/inode.c b/fs/xfs/scrub/inode.c
index 153d4eb91b9317f08a3ca6c3a883ba3473ba460d..5eac188d18ea35571f5bfef75a88145fa1664205 100644 (file)
--- a/fs/xfs/scrub/inode.c
+++ b/fs/xfs/scrub/inode.c
@@ -39,6 +39,7 @@
 #include "scrub/xfs_scrub.h"
 #include "scrub/scrub.h"
 #include "scrub/common.h"
+#include "scrub/btree.h"
 #include "scrub/trace.h"
 
 /*
@@ -577,6 +578,53 @@ out_buf:
        return error;
 }
 
+/*
+ * Make sure the finobt doesn't think this inode is free.
+ * We don't have to check the inobt ourselves because we got the inode via
+ * IGET_UNTRUSTED, which checks the inobt for us.
+ */
+static void
+xfs_scrub_inode_xref_finobt(
+       struct xfs_scrub_context        *sc,
+       xfs_ino_t                       ino)
+{
+       struct xfs_inobt_rec_incore     rec;
+       xfs_agino_t                     agino;
+       int                             has_record;
+       int                             error;
+
+       if (!sc->sa.fino_cur)
+               return;
+
+       agino = XFS_INO_TO_AGINO(sc->mp, ino);
+
+       /*
+        * Try to get the finobt record.  If we can't get it, then we're
+        * in good shape.
+        */
+       error = xfs_inobt_lookup(sc->sa.fino_cur, agino, XFS_LOOKUP_LE,
+                       &has_record);
+       if (!xfs_scrub_should_check_xref(sc, &error, &sc->sa.fino_cur) ||
+           !has_record)
+               return;
+
+       error = xfs_inobt_get_rec(sc->sa.fino_cur, &rec, &has_record);
+       if (!xfs_scrub_should_check_xref(sc, &error, &sc->sa.fino_cur) ||
+           !has_record)
+               return;
+
+       /*
+        * Otherwise, make sure this record either doesn't cover this inode,
+        * or that it does but it's marked present.
+        */
+       if (rec.ir_startino > agino ||
+           rec.ir_startino + XFS_INODES_PER_CHUNK <= agino)
+               return;
+
+       if (rec.ir_free & XFS_INOBT_MASK(agino - rec.ir_startino))
+               xfs_scrub_btree_xref_set_corrupt(sc, sc->sa.fino_cur, 0);
+}
+
 /* Cross-reference with the other btrees. */
 STATIC void
 xfs_scrub_inode_xref(
@@ -599,6 +647,7 @@ xfs_scrub_inode_xref(
                return;
 
        xfs_scrub_xref_is_used_space(sc, agbno, 1);
+       xfs_scrub_inode_xref_finobt(sc, ino);
 
        xfs_scrub_ag_free(sc, &sc->sa);
 }

diff --git a/fs/xfs/scrub/refcount.c b/fs/xfs/scrub/refcount.c
index 09a04ae0895e44ebc2f4d8d42875323e90bccc85..af54590f331bcafa7b609cff8513152c192898e1 100644 (file)
--- a/fs/xfs/scrub/refcount.c
+++ b/fs/xfs/scrub/refcount.c
@@ -62,6 +62,7 @@ xfs_scrub_refcountbt_xref(
                return;
 
        xfs_scrub_xref_is_used_space(sc, agbno, len);
+       xfs_scrub_xref_is_not_inode_chunk(sc, agbno, len);
 }
 
 /* Scrub a refcountbt record. */

diff --git a/fs/xfs/scrub/rmap.c b/fs/xfs/scrub/rmap.c
index 54b0eac22707ce742cc58ebf7ca937aaf5e0b1dc..6e937ef142184813c8907b50dda96d6385679f13 100644 (file)
--- a/fs/xfs/scrub/rmap.c
+++ b/fs/xfs/scrub/rmap.c
@@ -64,6 +64,10 @@ xfs_scrub_rmapbt_xref(
                return;
 
        xfs_scrub_xref_is_used_space(sc, agbno, len);
+       if (irec->rm_owner == XFS_RMAP_OWN_INODES)
+               xfs_scrub_xref_is_inode_chunk(sc, agbno, len);
+       else
+               xfs_scrub_xref_is_not_inode_chunk(sc, agbno, len);
 }
 
 /* Scrub an rmapbt record. */

diff --git a/fs/xfs/scrub/scrub.h b/fs/xfs/scrub/scrub.h
index cbc63632617150dd5d8cc0a675d17686b9b088e4..9b0033baa90b6376fde0ce8d7569bab38c3933f8 100644 (file)
--- a/fs/xfs/scrub/scrub.h
+++ b/fs/xfs/scrub/scrub.h
@@ -126,5 +126,9 @@ xfs_scrub_quota(struct xfs_scrub_context *sc)
 /* cross-referencing helpers */
 void xfs_scrub_xref_is_used_space(struct xfs_scrub_context *sc,
                xfs_agblock_t agbno, xfs_extlen_t len);
+void xfs_scrub_xref_is_not_inode_chunk(struct xfs_scrub_context *sc,
+               xfs_agblock_t agbno, xfs_extlen_t len);
+void xfs_scrub_xref_is_inode_chunk(struct xfs_scrub_context *sc,
+               xfs_agblock_t agbno, xfs_extlen_t len);
 
 #endif /* __XFS_SCRUB_SCRUB_H__ */