From patchwork Sat Jan 7 00:38:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 9502571 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 80AED60459 for ; Sat, 7 Jan 2017 00:38:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 734CD2850E for ; Sat, 7 Jan 2017 00:38:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 67F4F28534; Sat, 7 Jan 2017 00:38:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0DE212850E for ; Sat, 7 Jan 2017 00:38:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1033955AbdAGAie (ORCPT ); Fri, 6 Jan 2017 19:38:34 -0500 Received: from userp1040.oracle.com ([156.151.31.81]:40954 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1032643AbdAGAie (ORCPT ); Fri, 6 Jan 2017 19:38:34 -0500 Received: from userv0021.oracle.com (userv0021.oracle.com [156.151.31.71]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id v070cXwC024722 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Sat, 7 Jan 2017 00:38:33 GMT Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by userv0021.oracle.com (8.14.4/8.14.4) with ESMTP id v070cWTt012504 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Sat, 7 Jan 2017 00:38:33 GMT Received: from abhmp0017.oracle.com (abhmp0017.oracle.com [141.146.116.23]) by userv0121.oracle.com (8.14.4/8.13.8) with ESMTP id v070cW1q004239 for ; Sat, 7 Jan 2017 00:38:32 GMT Received: from localhost (/24.21.211.40) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 06 Jan 2017 16:38:31 -0800 Subject: [PATCH 25/47] xfs: scrub should cross-reference with the bnobt From: "Darrick J. Wong" To: darrick.wong@oracle.com Cc: linux-xfs@vger.kernel.org Date: Fri, 06 Jan 2017 16:38:26 -0800 Message-ID: <148374950624.30431.17785242455492366748.stgit@birch.djwong.org> In-Reply-To: <148374934333.30431.11042523766304087227.stgit@birch.djwong.org> References: <148374934333.30431.11042523766304087227.stgit@birch.djwong.org> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Source-IP: userv0021.oracle.com [156.151.31.71] Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When we're scrubbing various btrees, cross-reference the records with the bnobt to ensure that we don't also think the space is free. Signed-off-by: Darrick J. Wong --- fs/xfs/libxfs/xfs_alloc.c | 19 ++++++++ fs/xfs/libxfs/xfs_alloc.h | 3 + fs/xfs/repair/agheader.c | 106 ++++++++++++++++++++++++++++++++++++++++++++- fs/xfs/repair/bmap.c | 14 ++++++ fs/xfs/repair/btree.c | 101 +++++++++++++++++++++++++++++++++++++++++++ fs/xfs/repair/common.c | 38 ++++++++++++++++ fs/xfs/repair/common.h | 10 ++++ fs/xfs/repair/ialloc.c | 13 ++++++ fs/xfs/repair/refcount.c | 17 +++++++ fs/xfs/repair/rmap.c | 18 +++++++- 10 files changed, 336 insertions(+), 3 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/fs/xfs/libxfs/xfs_alloc.c b/fs/xfs/libxfs/xfs_alloc.c index 1b6bddb..ad8044b 100644 --- a/fs/xfs/libxfs/xfs_alloc.c +++ b/fs/xfs/libxfs/xfs_alloc.c @@ -2991,3 +2991,22 @@ xfs_alloc_query_all( query.fn = fn; return xfs_btree_query_all(cur, xfs_alloc_query_range_helper, &query); } + +/* Is there a record covering a given extent? */ +int +xfs_alloc_has_record( + struct xfs_btree_cur *cur, + xfs_agblock_t bno, + xfs_extlen_t len, + bool *exists) +{ + union xfs_btree_irec low; + union xfs_btree_irec high; + + memset(&low, 0, sizeof(low)); + low.a.ar_startblock = bno; + memset(&high, 0xFF, sizeof(high)); + high.a.ar_startblock = bno + len - 1; + + return xfs_btree_has_record(cur, &low, &high, exists); +} diff --git a/fs/xfs/libxfs/xfs_alloc.h b/fs/xfs/libxfs/xfs_alloc.h index 89a23be..3fd6540 100644 --- a/fs/xfs/libxfs/xfs_alloc.h +++ b/fs/xfs/libxfs/xfs_alloc.h @@ -237,4 +237,7 @@ int xfs_alloc_query_range(struct xfs_btree_cur *cur, int xfs_alloc_query_all(struct xfs_btree_cur *cur, xfs_alloc_query_range_fn fn, void *priv); +int xfs_alloc_has_record(struct xfs_btree_cur *cur, xfs_agblock_t bno, + xfs_extlen_t len, bool *exist); + #endif /* __XFS_ALLOC_H__ */ diff --git a/fs/xfs/repair/agheader.c b/fs/xfs/repair/agheader.c index 8812b64..6375f19 100644 --- a/fs/xfs/repair/agheader.c +++ b/fs/xfs/repair/agheader.c @@ -31,6 +31,7 @@ #include "xfs_trace.h" #include "xfs_sb.h" #include "xfs_inode.h" +#include "xfs_alloc.h" #include "repair/common.h" /* Set us up to check an AG header. */ @@ -129,10 +130,13 @@ xfs_scrub_superblock( { struct xfs_mount *mp = sc->tp->t_mountp; struct xfs_buf *bp; + struct xfs_scrub_ag *psa; struct xfs_sb sb; xfs_agnumber_t agno; uint32_t v2_ok; + bool is_freesp; int error; + int err2; agno = sc->sm->sm_agno; @@ -152,7 +156,7 @@ xfs_scrub_superblock( * so there's no point in comparing the two. */ if (agno == 0) - goto out; + goto btree_xref; xfs_sb_from_disk(&sb, XFS_BUF_TO_SBP(bp)); @@ -251,6 +255,24 @@ xfs_scrub_superblock( XFS_SCRUB_SB_FEAT(realtime); #undef XFS_SCRUB_SB_FEAT + if (error) + goto out; + +btree_xref: + + err2 = xfs_scrub_ag_init(sc, agno, &sc->sa); + if (!xfs_scrub_should_xref(sc, err2, NULL)) + goto out; + + psa = &sc->sa; + /* Cross-reference with bnobt. */ + if (psa->bno_cur) { + err2 = xfs_alloc_has_record(psa->bno_cur, XFS_SB_BLOCK(mp), + 1, &is_freesp); + if (xfs_scrub_should_xref(sc, err2, &psa->bno_cur)) + XFS_SCRUB_SB_CHECK(!is_freesp); + } + out: return error; } @@ -259,6 +281,19 @@ xfs_scrub_superblock( /* AGF */ +/* Tally freespace record lengths. */ +STATIC int +xfs_scrub_agf_record_bno_lengths( + struct xfs_btree_cur *cur, + struct xfs_alloc_rec_incore *rec, + void *priv) +{ + xfs_extlen_t *blocks = priv; + + (*blocks) += rec->ar_blockcount; + return 0; +} + #define XFS_SCRUB_AGF_CHECK(fs_ok) \ XFS_SCRUB_CHECK(sc, sc->sa.agf_bp, "AGF", fs_ok) #define XFS_SCRUB_AGF_OP_ERROR_GOTO(error, label) \ @@ -271,6 +306,7 @@ xfs_scrub_agf( { struct xfs_mount *mp = sc->tp->t_mountp; struct xfs_agf *agf; + struct xfs_scrub_ag *psa; xfs_daddr_t daddr; xfs_daddr_t eofs; xfs_agnumber_t agno; @@ -280,8 +316,11 @@ xfs_scrub_agf( xfs_agblock_t agfl_last; xfs_agblock_t agfl_count; xfs_agblock_t fl_count; + xfs_extlen_t blocks; + bool is_freesp; int level; int error = 0; + int err2; agno = sc->sm->sm_agno; error = xfs_scrub_load_ag_headers(sc, agno, XFS_SCRUB_TYPE_AGF); @@ -353,6 +392,31 @@ xfs_scrub_agf( fl_count = XFS_AGFL_SIZE(mp) - agfl_first + agfl_last + 1; XFS_SCRUB_AGF_CHECK(agfl_count == 0 || fl_count == agfl_count); + /* Load btrees for xref if the AGF is ok. */ + psa = &sc->sa; + if (error || (sc->sm->sm_flags & XFS_SCRUB_FLAG_CORRUPT)) + goto out; + error = xfs_scrub_ag_btcur_init(sc, psa); + if (error) + goto out; + + /* Cross-reference with the bnobt. */ + if (psa->bno_cur) { + err2 = xfs_alloc_has_record(psa->bno_cur, XFS_AGF_BLOCK(mp), + 1, &is_freesp); + if (!xfs_scrub_should_xref(sc, err2, &psa->bno_cur)) + goto skip_bnobt; + XFS_SCRUB_AGF_CHECK(!is_freesp); + + blocks = 0; + err2 = xfs_alloc_query_all(psa->bno_cur, + xfs_scrub_agf_record_bno_lengths, &blocks); + if (!xfs_scrub_should_xref(sc, err2, &psa->bno_cur)) + goto skip_bnobt; + XFS_SCRUB_AGF_CHECK(blocks == be32_to_cpu(agf->agf_freeblks)); + } +skip_bnobt: + out: return error; } @@ -378,12 +442,22 @@ xfs_scrub_agfl_block( struct xfs_mount *mp = sc->tp->t_mountp; xfs_agnumber_t agno = sc->sa.agno; struct xfs_scrub_agfl *sagfl = priv; + bool is_freesp; + int err2; XFS_SCRUB_AGFL_CHECK(agbno > XFS_AGI_BLOCK(mp)); XFS_SCRUB_AGFL_CHECK(XFS_AGB_TO_DADDR(mp, agno, agbno) < sagfl->eofs); XFS_SCRUB_AGFL_CHECK(agbno < mp->m_sb.sb_agblocks); XFS_SCRUB_AGFL_CHECK(agbno < sagfl->eoag); + /* Cross-reference with the bnobt. */ + if (sc->sa.bno_cur) { + err2 = xfs_alloc_has_record(sc->sa.bno_cur, agbno, + 1, &is_freesp); + if (xfs_scrub_should_xref(sc, err2, &sc->sa.bno_cur)) + XFS_SCRUB_AGFL_CHECK(!is_freesp); + } + return 0; } @@ -398,7 +472,9 @@ xfs_scrub_agfl( struct xfs_scrub_agfl sagfl; struct xfs_mount *mp = sc->tp->t_mountp; struct xfs_agf *agf; + bool is_freesp; int error; + int err2; error = xfs_scrub_load_ag_headers(sc, sc->sm->sm_agno, XFS_SCRUB_TYPE_AGFL); @@ -410,6 +486,14 @@ xfs_scrub_agfl( sagfl.eofs = XFS_FSB_TO_BB(mp, mp->m_sb.sb_dblocks); sagfl.eoag = be32_to_cpu(agf->agf_length); + /* Cross-reference with the bnobt. */ + if (sc->sa.bno_cur) { + err2 = xfs_alloc_has_record(sc->sa.bno_cur, XFS_AGFL_BLOCK(mp), + 1, &is_freesp); + if (xfs_scrub_should_xref(sc, err2, &sc->sa.bno_cur)) + XFS_SCRUB_AGFL_CHECK(!is_freesp); + } + /* Check the blocks in the AGFL. */ return xfs_scrub_walk_agfl(sc, xfs_scrub_agfl_block, &sagfl); out: @@ -432,6 +516,7 @@ xfs_scrub_agi( { struct xfs_mount *mp = sc->tp->t_mountp; struct xfs_agi *agi; + struct xfs_scrub_ag *psa; xfs_daddr_t daddr; xfs_daddr_t eofs; xfs_agnumber_t agno; @@ -440,9 +525,11 @@ xfs_scrub_agi( xfs_agino_t agino; xfs_agino_t first_agino; xfs_agino_t last_agino; + bool is_freesp; int i; int level; int error = 0; + int err2; agno = sc->sm->sm_agno; error = xfs_scrub_load_ag_headers(sc, agno, XFS_SCRUB_TYPE_AGI); @@ -508,8 +595,23 @@ xfs_scrub_agi( XFS_SCRUB_AGI_CHECK(agino <= last_agino); } + /* Load btrees for xref if the AGI is ok. */ + psa = &sc->sa; + if (error || (sc->sm->sm_flags & XFS_SCRUB_FLAG_CORRUPT)) + goto out; + error = xfs_scrub_ag_btcur_init(sc, &sc->sa); + if (error) + goto out; + + /* Cross-reference with bnobt. */ + if (psa->bno_cur) { + err2 = xfs_alloc_has_record(psa->bno_cur, XFS_AGI_BLOCK(mp), + 1, &is_freesp); + if (xfs_scrub_should_xref(sc, err2, &psa->bno_cur)) + XFS_SCRUB_AGI_CHECK(!is_freesp); + } + out: return error; } #undef XFS_SCRUB_AGI_CHECK -#undef XFS_SCRUB_AGI_OP_ERROR_GOTO diff --git a/fs/xfs/repair/bmap.c b/fs/xfs/repair/bmap.c index bc1ad8e..5cb89f7 100644 --- a/fs/xfs/repair/bmap.c +++ b/fs/xfs/repair/bmap.c @@ -36,6 +36,7 @@ #include "xfs_bmap_util.h" #include "xfs_bmap_btree.h" #include "xfs_rmap.h" +#include "xfs_alloc.h" #include "repair/common.h" #include "repair/btree.h" @@ -100,7 +101,10 @@ xfs_scrub_bmap_extent( xfs_daddr_t daddr; xfs_daddr_t dlen; xfs_agnumber_t agno; + xfs_fsblock_t bno; + bool is_freesp; int error = 0; + int err2 = 0; if (cur) xfs_btree_get_block(cur, 0, &bp); @@ -117,10 +121,12 @@ xfs_scrub_bmap_extent( if (info->is_rt) { daddr = XFS_FSB_TO_BB(mp, irec->br_startblock); agno = NULLAGNUMBER; + bno = irec->br_startblock; } else { daddr = XFS_FSB_TO_DADDR(mp, irec->br_startblock); agno = XFS_FSB_TO_AGNO(mp, irec->br_startblock); XFS_SCRUB_BMAP_GOTO(agno < mp->m_sb.sb_agcount, out); + bno = XFS_FSB_TO_AGBNO(mp, irec->br_startblock); } dlen = XFS_FSB_TO_BB(mp, irec->br_blockcount); XFS_SCRUB_BMAP_CHECK(daddr < info->eofs); @@ -138,6 +144,14 @@ xfs_scrub_bmap_extent( XFS_SCRUB_BMAP_OP_ERROR_GOTO(out); } + /* Cross-reference with the bnobt. */ + if (sa.bno_cur) { + err2 = xfs_alloc_has_record(sa.bno_cur, bno, + irec->br_blockcount, &is_freesp); + if (xfs_scrub_should_xref(info->sc, err2, &sa.bno_cur)) + XFS_SCRUB_BMAP_CHECK(!is_freesp); + } + xfs_scrub_ag_free(&sa); out: info->lastoff = irec->br_startoff + irec->br_blockcount; diff --git a/fs/xfs/repair/btree.c b/fs/xfs/repair/btree.c index 6956503..c13762e 100644 --- a/fs/xfs/repair/btree.c +++ b/fs/xfs/repair/btree.c @@ -494,6 +494,93 @@ xfs_scrub_btree_sblock_check_siblings( return error; } +struct check_owner { + struct list_head list; + xfs_fsblock_t fsb; +}; + +/* + * Make sure this btree block isn't in the free list and that there's + * an rmap record for it. + */ +STATIC int +xfs_scrub_btree_check_block_owner( + struct xfs_scrub_btree *bs, + xfs_fsblock_t fsb) +{ + struct xfs_scrub_ag sa; + struct xfs_scrub_ag *psa; + xfs_agnumber_t agno; + xfs_agblock_t bno; + bool is_freesp; + int error = 0; + int err2; + + agno = XFS_FSB_TO_AGNO(bs->cur->bc_mp, fsb); + bno = XFS_FSB_TO_AGBNO(bs->cur->bc_mp, fsb); + + if (bs->cur->bc_flags & XFS_BTREE_LONG_PTRS) { + if (!xfs_scrub_ag_can_lock(bs->sc, agno)) + return -EDEADLOCK; + error = xfs_scrub_ag_init(bs->sc, agno, &sa); + if (error) + return error; + psa = &sa; + } else + psa = &bs->sc->sa; + + /* Check that this block isn't free. */ + if (psa->bno_cur) { + err2 = xfs_alloc_has_record(psa->bno_cur, bno, 1, &is_freesp); + if (xfs_scrub_btree_should_xref(bs, err2, NULL)) + XFS_SCRUB_BTREC_CHECK(bs, !is_freesp); + } + + if (bs->cur->bc_flags & XFS_BTREE_LONG_PTRS) + xfs_scrub_ag_free(&sa); + + return error; +} + +/* Check the owner of a btree block. */ +STATIC int +xfs_scrub_btree_check_owner( + struct xfs_scrub_btree *bs, + struct xfs_buf *bp) +{ + struct xfs_btree_cur *cur = bs->cur; + struct check_owner *co; + xfs_fsblock_t fsbno; + xfs_agnumber_t agno; + + if ((cur->bc_flags & XFS_BTREE_ROOT_IN_INODE) && bp == NULL) + return 0; + + fsbno = XFS_DADDR_TO_FSB(cur->bc_mp, bp->b_bn); + agno = XFS_FSB_TO_AGNO(cur->bc_mp, fsbno); + + /* Turn back if we could deadlock. */ + if ((bs->cur->bc_flags & XFS_BTREE_LONG_PTRS) && + !xfs_scrub_ag_can_lock(bs->sc, agno)) + return -EDEADLOCK; + + /* + * We want to cross-reference each btree block with the bnobt + * and the rmapbt. We cannot cross-reference the bnobt or + * rmapbt while scanning the bnobt or rmapbt, respectively, + * because that would trash the cursor state. Therefore, save + * the block numbers for later scanning. + */ + if (cur->bc_btnum == XFS_BTNUM_BNO || cur->bc_btnum == XFS_BTNUM_RMAP) { + co = kmem_alloc(sizeof(struct check_owner), KM_SLEEP | KM_NOFS); + co->fsb = fsbno; + list_add_tail(&co->list, &bs->to_check); + return 0; + } + + return xfs_scrub_btree_check_block_owner(bs, fsbno); +} + /* Grab and scrub a btree block. */ STATIC int xfs_scrub_btree_block( @@ -514,6 +601,10 @@ xfs_scrub_btree_block( if (error) return error; + error = xfs_scrub_btree_check_owner(bs, *pbp); + if (error) + return error; + return bs->check_siblings_fn(bs, *pblock); } @@ -539,6 +630,8 @@ xfs_scrub_btree( struct xfs_btree_block *block; int level; struct xfs_buf *bp; + struct check_owner *co; + struct check_owner *n; int i; int error = 0; @@ -653,6 +746,14 @@ xfs_scrub_btree( } } + /* Process deferred owner checks on btree blocks. */ + list_for_each_entry_safe(co, n, &bs.to_check, list) { + if (!error) + error = xfs_scrub_btree_check_block_owner(&bs, co->fsb); + list_del(&co->list); + kmem_free(co); + } + out_badcursor: return error; } diff --git a/fs/xfs/repair/common.c b/fs/xfs/repair/common.c index 6adccb5..458057a 100644 --- a/fs/xfs/repair/common.c +++ b/fs/xfs/repair/common.c @@ -533,6 +533,44 @@ xfs_scrub_ag_lock_all( return error; } +/* + * Predicate that decides if we need to evaluate the cross-reference check. + * If there was an error accessing the cross-reference btree, just delete + * the cursor and skip the check. + */ +bool +__xfs_scrub_should_xref( + struct xfs_scrub_context *sc, + int error, + struct xfs_btree_cur **curpp, + const char *func, + int line) +{ + struct xfs_mount *mp = sc->tp->t_mountp; + + /* If not a btree cross-reference, just check the error code. */ + if (curpp == NULL) { + if (error == 0) + return true; + trace_xfs_scrub_xref_error(mp, "unknown", error, func, line); + return false; + } + + ASSERT(*curpp != NULL); + /* If no error or we've already given up on xref, just bail out. */ + if (error == 0 || *curpp == NULL) + return true; + + /* xref error, delete cursor and bail out. */ + sc->sm->sm_flags |= XFS_SCRUB_FLAG_XREF_FAIL; + trace_xfs_scrub_xref_error(mp, btree_types[(*curpp)->bc_btnum], + error, func, line); + xfs_btree_del_cursor(*curpp, XFS_BTREE_ERROR); + *curpp = NULL; + + return false; +} + /* Dummy scrubber */ STATIC int diff --git a/fs/xfs/repair/common.h b/fs/xfs/repair/common.h index 8dc68b9..bff1b2c 100644 --- a/fs/xfs/repair/common.h +++ b/fs/xfs/repair/common.h @@ -180,6 +180,14 @@ bool xfs_scrub_data_ok(struct xfs_scrub_context *sc, int whichfork, goto label; \ } while(0) +bool __xfs_scrub_should_xref(struct xfs_scrub_context *sc, int error, + struct xfs_btree_cur **curpp, const char *func, + int line); +#define xfs_scrub_should_xref(sc, error, curpp) \ + __xfs_scrub_should_xref((sc), (error), (curpp), __func__, __LINE__) +#define xfs_scrub_btree_should_xref(bs, error, curpp) \ + __xfs_scrub_should_xref((bs)->sc, (error), (curpp), __func__, __LINE__) + bool xfs_scrub_ag_can_lock(struct xfs_scrub_context *sc, xfs_agnumber_t agno); int xfs_scrub_ag_lock_all(struct xfs_scrub_context *sc); void xfs_scrub_ag_lock_init(struct xfs_mount *mp, @@ -198,6 +206,8 @@ int xfs_scrub_walk_agfl(struct xfs_scrub_context *sc, int (*fn)(struct xfs_scrub_context *, xfs_agblock_t bno, void *), void *priv); +int xfs_scrub_ag_btcur_init(struct xfs_scrub_context *sc, + struct xfs_scrub_ag *sa); /* Setup functions */ diff --git a/fs/xfs/repair/ialloc.c b/fs/xfs/repair/ialloc.c index 67cf727..3c45fe6 100644 --- a/fs/xfs/repair/ialloc.c +++ b/fs/xfs/repair/ialloc.c @@ -37,6 +37,7 @@ #include "xfs_rmap.h" #include "xfs_log.h" #include "xfs_trans_priv.h" +#include "xfs_alloc.h" #include "repair/common.h" #include "repair/btree.h" @@ -83,9 +84,12 @@ xfs_scrub_iallocbt_chunk( { struct xfs_mount *mp = bs->cur->bc_mp; struct xfs_agf *agf; + struct xfs_scrub_ag *psa; xfs_agblock_t eoag; xfs_agblock_t bno; + bool is_freesp; int error = 0; + int err2; agf = XFS_BUF_TO_AGF(bs->sc->sa.agf_bp); eoag = be32_to_cpu(agf->agf_length); @@ -104,6 +108,15 @@ xfs_scrub_iallocbt_chunk( goto out; } + psa = &bs->sc->sa; + /* Cross-reference with the bnobt. */ + if (psa->bno_cur) { + err2 = xfs_alloc_has_record(psa->bno_cur, bno, len, + &is_freesp); + if (xfs_scrub_btree_should_xref(bs, err2, &psa->bno_cur)) + XFS_SCRUB_BTREC_CHECK(bs, !is_freesp); + } + out: return error; } diff --git a/fs/xfs/repair/refcount.c b/fs/xfs/repair/refcount.c index 186d83c..0cf82600 100644 --- a/fs/xfs/repair/refcount.c +++ b/fs/xfs/repair/refcount.c @@ -31,6 +31,7 @@ #include "xfs_trace.h" #include "xfs_sb.h" #include "xfs_rmap.h" +#include "xfs_alloc.h" #include "repair/common.h" #include "repair/btree.h" @@ -44,10 +45,13 @@ xfs_scrub_refcountbt_helper( { struct xfs_mount *mp = bs->cur->bc_mp; struct xfs_agf *agf; + struct xfs_scrub_ag *psa; struct xfs_refcount_irec irec; xfs_agblock_t eoag; bool has_cowflag; + bool is_freesp; int error = 0; + int err2; irec.rc_startblock = be32_to_cpu(rec->refc.rc_startblock); irec.rc_blockcount = be32_to_cpu(rec->refc.rc_blockcount); @@ -69,6 +73,19 @@ xfs_scrub_refcountbt_helper( irec.rc_blockcount <= eoag); XFS_SCRUB_BTREC_CHECK(bs, irec.rc_refcount >= 1); + if (error) + goto out; + + psa = &bs->sc->sa; + /* Cross-reference with the bnobt. */ + if (psa->bno_cur) { + err2 = xfs_alloc_has_record(psa->bno_cur, irec.rc_startblock, + irec.rc_blockcount, &is_freesp); + if (xfs_scrub_btree_should_xref(bs, err2, &psa->bno_cur)) + XFS_SCRUB_BTREC_CHECK(bs, !is_freesp); + } + +out: return error; } diff --git a/fs/xfs/repair/rmap.c b/fs/xfs/repair/rmap.c index 9ae3c72..c04cfb6 100644 --- a/fs/xfs/repair/rmap.c +++ b/fs/xfs/repair/rmap.c @@ -31,6 +31,7 @@ #include "xfs_trace.h" #include "xfs_sb.h" #include "xfs_rmap.h" +#include "xfs_alloc.h" #include "repair/common.h" #include "repair/btree.h" @@ -44,13 +45,16 @@ xfs_scrub_rmapbt_helper( { struct xfs_mount *mp = bs->cur->bc_mp; struct xfs_agf *agf; + struct xfs_scrub_ag *psa; struct xfs_rmap_irec irec; xfs_agblock_t eoag; + bool is_freesp; bool non_inode; bool is_unwritten; bool is_bmbt; bool is_attr; - int error; + int error = 0; + int err2; error = xfs_rmap_btrec_to_irec(rec, &irec); XFS_SCRUB_BTREC_OP_ERROR_GOTO(bs, &error, out); @@ -99,6 +103,18 @@ xfs_scrub_rmapbt_helper( XFS_SCRUB_BTREC_CHECK(bs, !non_inode || (irec.rm_owner > XFS_RMAP_OWN_MIN && irec.rm_owner <= XFS_RMAP_OWN_FS)); + if (error) + goto out; + + psa = &bs->sc->sa; + /* check there's no record in freesp btrees */ + if (psa->bno_cur) { + err2 = xfs_alloc_has_record(psa->bno_cur, irec.rm_startblock, + irec.rm_blockcount, &is_freesp); + if (xfs_scrub_btree_should_xref(bs, err2, &psa->bno_cur)) + XFS_SCRUB_BTREC_CHECK(bs, !is_freesp); + } + out: return error; }