Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f6d5fc21 authored by Darrick J. Wong's avatar Darrick J. Wong
Browse files

xfs: cross-reference refcount btree during scrub 



During metadata btree scrub, we should cross-reference with the
reference counts.

Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
parent dbde19da

fs/xfs/scrub/agheader.c

+25 −0
Original line number Diff line number Diff line
@@ -127,6 +127,7 @@ xfs_scrub_superblock_xref( 
	xfs_scrub_xref_is_not_inode_chunk(sc, agbno, 1);

	xfs_rmap_ag_owner(&oinfo, XFS_RMAP_OWN_FS);

	xfs_scrub_xref_is_owned_by(sc, agbno, 1, &oinfo);

	xfs_scrub_xref_is_not_shared(sc, agbno, 1);



	/* scrub teardown will take care of sc->sa for us */

}
@@ -537,6 +538,25 @@ xfs_scrub_agf_xref_btreeblks( 
		xfs_scrub_block_xref_set_corrupt(sc, sc->sa.agf_bp);

}



/* Check agf_refcount_blocks against tree size */

static inline void

xfs_scrub_agf_xref_refcblks(

	struct xfs_scrub_context	*sc)

{

	struct xfs_agf			*agf = XFS_BUF_TO_AGF(sc->sa.agf_bp);

	xfs_agblock_t			blocks;

	int				error;



	if (!sc->sa.refc_cur)

		return;



	error = xfs_btree_count_blocks(sc->sa.refc_cur, &blocks);

	if (!xfs_scrub_should_check_xref(sc, &error, &sc->sa.refc_cur))

		return;

	if (blocks != be32_to_cpu(agf->agf_refcount_blocks))

		xfs_scrub_block_xref_set_corrupt(sc, sc->sa.agf_bp);

}



/* Cross-reference with the other btrees. */

STATIC void

xfs_scrub_agf_xref(
@@ -563,6 +583,8 @@ xfs_scrub_agf_xref( 
	xfs_rmap_ag_owner(&oinfo, XFS_RMAP_OWN_FS);

	xfs_scrub_xref_is_owned_by(sc, agbno, 1, &oinfo);

	xfs_scrub_agf_xref_btreeblks(sc);

	xfs_scrub_xref_is_not_shared(sc, agbno, 1);

	xfs_scrub_agf_xref_refcblks(sc);



	/* scrub teardown will take care of sc->sa for us */

}
@@ -672,6 +694,7 @@ xfs_scrub_agfl_block_xref( 
	xfs_scrub_xref_is_used_space(sc, agbno, 1);

	xfs_scrub_xref_is_not_inode_chunk(sc, agbno, 1);

	xfs_scrub_xref_is_owned_by(sc, agbno, 1, oinfo);

	xfs_scrub_xref_is_not_shared(sc, agbno, 1);

}



/* Scrub an AGFL block. */
@@ -730,6 +753,7 @@ xfs_scrub_agfl_xref( 
	xfs_scrub_xref_is_not_inode_chunk(sc, agbno, 1);

	xfs_rmap_ag_owner(&oinfo, XFS_RMAP_OWN_FS);

	xfs_scrub_xref_is_owned_by(sc, agbno, 1, &oinfo);

	xfs_scrub_xref_is_not_shared(sc, agbno, 1);



	/*

	 * Scrub teardown will take care of sc->sa for us.  Leave sc->sa
@@ -850,6 +874,7 @@ xfs_scrub_agi_xref( 
	xfs_scrub_agi_xref_icounts(sc);

	xfs_rmap_ag_owner(&oinfo, XFS_RMAP_OWN_FS);

	xfs_scrub_xref_is_owned_by(sc, agbno, 1, &oinfo);

	xfs_scrub_xref_is_not_shared(sc, agbno, 1);



	/* scrub teardown will take care of sc->sa for us */

}

fs/xfs/scrub/alloc.c

+1 −0
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ xfs_scrub_allocbt_xref( 
	xfs_scrub_allocbt_xref_other(sc, agbno, len);

	xfs_scrub_xref_is_not_inode_chunk(sc, agbno, len);

	xfs_scrub_xref_has_no_owner(sc, agbno, len);

	xfs_scrub_xref_is_not_shared(sc, agbno, len);

}



/* Scrub a bnobt/cntbt record. */

fs/xfs/scrub/bmap.c

+15 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
#include "xfs_bmap_util.h"

#include "xfs_bmap_btree.h"

#include "xfs_rmap.h"

#include "xfs_refcount.h"

#include "scrub/xfs_scrub.h"

#include "scrub/scrub.h"

#include "scrub/common.h"
@@ -273,6 +274,20 @@ xfs_scrub_bmap_extent_xref( 
	xfs_scrub_xref_is_used_space(info->sc, agbno, len);

	xfs_scrub_xref_is_not_inode_chunk(info->sc, agbno, len);

	xfs_scrub_bmap_xref_rmap(info, irec, agbno);

	switch (info->whichfork) {

	case XFS_DATA_FORK:

		if (xfs_is_reflink_inode(info->sc->ip))

			break;

		/* fall through */

	case XFS_ATTR_FORK:

		xfs_scrub_xref_is_not_shared(info->sc, agbno,

				irec->br_blockcount);

		break;

	case XFS_COW_FORK:

		xfs_scrub_xref_is_cow_staging(info->sc, agbno,

				irec->br_blockcount);

		break;

	}



	xfs_scrub_ag_free(info->sc, &info->sc->sa);

}

fs/xfs/scrub/ialloc.c

+1 −0
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@ xfs_scrub_iallocbt_chunk_xref( 
	xfs_scrub_iallocbt_chunk_xref_other(sc, irec, agino);

	xfs_rmap_ag_owner(&oinfo, XFS_RMAP_OWN_INODES);

	xfs_scrub_xref_is_owned_by(sc, agbno, len, &oinfo);

	xfs_scrub_xref_is_not_shared(sc, agbno, len);

}



/* Is this chunk worth checking? */

fs/xfs/scrub/inode.c

+36 −14
Original line number Diff line number Diff line
@@ -652,22 +652,50 @@ xfs_scrub_inode_xref( 
	xfs_scrub_inode_xref_finobt(sc, ino);

	xfs_rmap_ag_owner(&oinfo, XFS_RMAP_OWN_INODES);

	xfs_scrub_xref_is_owned_by(sc, agbno, 1, &oinfo);

	xfs_scrub_xref_is_not_shared(sc, agbno, 1);



	xfs_scrub_ag_free(sc, &sc->sa);

}



/*

 * If the reflink iflag disagrees with a scan for shared data fork extents,

 * either flag an error (shared extents w/ no flag) or a preen (flag set w/o

 * any shared extents).  We already checked for reflink iflag set on a non

 * reflink filesystem.

 */

static void

xfs_scrub_inode_check_reflink_iflag(

	struct xfs_scrub_context	*sc,

	xfs_ino_t			ino,

	struct xfs_buf			*bp)

{

	struct xfs_mount		*mp = sc->mp;

	bool				has_shared;

	int				error;



	if (!xfs_sb_version_hasreflink(&mp->m_sb))

		return;



	error = xfs_reflink_inode_has_shared_extents(sc->tp, sc->ip,

			&has_shared);

	if (!xfs_scrub_xref_process_error(sc, XFS_INO_TO_AGNO(mp, ino),

			XFS_INO_TO_AGBNO(mp, ino), &error))

		return;

	if (xfs_is_reflink_inode(sc->ip) && !has_shared)

		xfs_scrub_ino_set_preen(sc, ino, bp);

	else if (!xfs_is_reflink_inode(sc->ip) && has_shared)

		xfs_scrub_ino_set_corrupt(sc, ino, bp);

}



/* Scrub an inode. */

int

xfs_scrub_inode(

	struct xfs_scrub_context	*sc)

{

	struct xfs_dinode		di;

	struct xfs_mount		*mp = sc->mp;

	struct xfs_buf			*bp = NULL;

	struct xfs_dinode		*dip;

	xfs_ino_t			ino;



	bool				has_shared;

	int				error = 0;



	/* Did we get the in-core inode, or are we doing this manually? */
@@ -692,18 +720,12 @@ xfs_scrub_inode( 
		goto out;



	/*

	 * Does this inode have the reflink flag set but no shared extents?

	 * Set the preening flag if this is the case.

	 * Look for discrepancies between file's data blocks and the reflink

	 * iflag.  We already checked the iflag against the file mode when

	 * we scrubbed the dinode.

	 */

	if (xfs_is_reflink_inode(sc->ip)) {

		error = xfs_reflink_inode_has_shared_extents(sc->tp, sc->ip,

				&has_shared);

		if (!xfs_scrub_xref_process_error(sc, XFS_INO_TO_AGNO(mp, ino),

				XFS_INO_TO_AGBNO(mp, ino), &error))

			goto out;

		if (!has_shared)

			xfs_scrub_ino_set_preen(sc, ino, bp);

	}

	if (S_ISREG(VFS_I(sc->ip)->i_mode))

		xfs_scrub_inode_check_reflink_iflag(sc, ino, bp);



	xfs_scrub_inode_xref(sc, ino, dip);

out: