Commit 7857acd8 authored by Chandan Babu R's avatar Chandan Babu R
Browse files

Merge tag 'repair-tweaks-6.6_2023-08-10' of... 

Merge tag 'repair-tweaks-6.6_2023-08-10' of https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux

 into xfs-6.6-mergeA

xfs: miscellaneous repair tweaks

Before we start adding online repair functionality, there's a few tweaks
that I'd like to make to the common repair code.  First is a fix to the
integration between repair and the health status code that was
interfering with repair re-evaluations.  Second is a minor tweak to the
sole existing repair functions to make one last check that the user
hasn't terminated the calling process before we start writing to the
filesystem.  This is a pattern that will repeat throughout the rest of
the repair functions.

Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
Signed-off-by: default avatarChandan Babu R <chandan.babu@oracle.com>

* tag 'repair-tweaks-6.6_2023-08-10' of https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux:
  xfs: allow the user to cancel repairs before we start writing
  xfs: always rescan allegedly healthy per-ag metadata after repair
parents df783323 d728f4e3

fs/xfs/scrub/agheader_repair.c

+16 −0
Original line number Diff line number Diff line
@@ -49,6 +49,10 @@ xrep_superblock( 
	if (error)

		return error;



	/* Last chance to abort before we start committing fixes. */

	if (xchk_should_terminate(sc, &error))

		return error;



	/* Copy AG 0's superblock to this one. */

	xfs_buf_zero(bp, 0, BBTOB(bp->b_length));

	xfs_sb_to_disk(bp->b_addr, &mp->m_sb);
@@ -424,6 +428,10 @@ xrep_agf( 
	if (error)

		return error;



	/* Last chance to abort before we start committing fixes. */

	if (xchk_should_terminate(sc, &error))

		return error;



	/* Start rewriting the header and implant the btrees we found. */

	xrep_agf_init_header(sc, agf_bp, &old_agf);

	xrep_agf_set_roots(sc, agf, fab);
@@ -748,6 +756,10 @@ xrep_agfl( 
	if (error)

		goto err;



	/* Last chance to abort before we start committing fixes. */

	if (xchk_should_terminate(sc, &error))

		goto err;



	/*

	 * Update AGF and AGFL.  We reset the global free block counter when

	 * we adjust the AGF flcount (which can fail) so avoid updating any
@@ -995,6 +1007,10 @@ xrep_agi( 
	if (error)

		return error;



	/* Last chance to abort before we start committing fixes. */

	if (xchk_should_terminate(sc, &error))

		return error;



	/* Start rewriting the header and implant the btrees we found. */

	xrep_agi_init_header(sc, agi_bp, &old_agi);

	xrep_agi_set_roots(sc, agi, fab);

fs/xfs/scrub/health.c

+10 −0
Original line number Diff line number Diff line
@@ -226,6 +226,16 @@ xchk_ag_btree_healthy_enough( 
		return true;

	}



	/*

	 * If we just repaired some AG metadata, sc->sick_mask will reflect all

	 * the per-AG metadata types that were repaired.  Exclude these from

	 * the filesystem health query because we have not yet updated the

	 * health status and we want everything to be scanned.

	 */

	if ((sc->flags & XREP_ALREADY_FIXED) &&

	    type_to_health_flag[sc->sm->sm_type].group == XHG_AG)

		mask &= ~sc->sick_mask;



	if (xfs_ag_has_sickness(pag, mask)) {

		sc->sm->sm_flags |= XFS_SCRUB_OFLAG_XFAIL;

		return false;