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

xfs: update health status if we get a clean bill of health 



If scrub finds that everything is ok with the filesystem, we need a way
to tell the health tracking that it can let go of indirect health flags,
since indirect flags only mean that at some point in the past we lost
some context.

Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
parent 0e24ec3c

fs/xfs/libxfs/xfs_fs.h

+2 −1
Original line number Diff line number Diff line
@@ -714,9 +714,10 @@ struct xfs_scrub_metadata { 
#define XFS_SCRUB_TYPE_FSCOUNTERS 24	/* fs summary counters */

#define XFS_SCRUB_TYPE_QUOTACHECK 25	/* quota counters */

#define XFS_SCRUB_TYPE_NLINKS	26	/* inode link counts */

#define XFS_SCRUB_TYPE_HEALTHY	27	/* everything checked out ok */



/* Number of scrub subcommands. */

#define XFS_SCRUB_TYPE_NR	27

#define XFS_SCRUB_TYPE_NR	28



/* i: Repair this metadata. */

#define XFS_SCRUB_IFLAG_REPAIR		(1u << 0)

fs/xfs/scrub/health.c

+64 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include "xfs_health.h"

#include "scrub/scrub.h"

#include "scrub/health.h"

#include "scrub/common.h"



/*

 * Scrub and In-Core Filesystem Health Assessments
@@ -149,6 +150,24 @@ xchk_file_looks_zapped( 
	return xfs_inode_has_sickness(sc->ip, mask);

}



/*

 * Scrub gave the filesystem a clean bill of health, so clear all the indirect

 * markers of past problems (at least for the fs and ags) so that we can be

 * healthy again.

 */

STATIC void

xchk_mark_all_healthy(

	struct xfs_mount	*mp)

{

	struct xfs_perag	*pag;

	xfs_agnumber_t		agno;



	xfs_fs_mark_healthy(mp, XFS_SICK_FS_INDIRECT);

	xfs_rt_mark_healthy(mp, XFS_SICK_RT_INDIRECT);

	for_each_perag(mp, agno, pag)

		xfs_ag_mark_healthy(pag, XFS_SICK_AG_INDIRECT);

}



/*

 * Update filesystem health assessments based on what we found and did.

 *
@@ -166,6 +185,18 @@ xchk_update_health( 
	struct xfs_perag	*pag;

	bool			bad;



	/*

	 * The HEALTHY scrub type is a request from userspace to clear all the

	 * indirect flags after a clean scan of the entire filesystem.  As such

	 * there's no sick flag defined for it, so we branch here ahead of the

	 * mask check.

	 */

	if (sc->sm->sm_type == XFS_SCRUB_TYPE_HEALTHY &&

	    !(sc->sm->sm_flags & XFS_SCRUB_OFLAG_CORRUPT)) {

		xchk_mark_all_healthy(sc->mp);

		return;

	}



	if (!sc->sick_mask)

		return;
@@ -285,3 +316,36 @@ xchk_ag_btree_healthy_enough( 


	return true;

}



/*

 * Quick scan to double-check that there isn't any evidence of lingering

 * primary health problems.  If we're still clear, then the health update will

 * take care of clearing the indirect evidence.

 */

int

xchk_health_record(

	struct xfs_scrub	*sc)

{

	struct xfs_mount	*mp = sc->mp;

	struct xfs_perag	*pag;

	xfs_agnumber_t		agno;



	unsigned int		sick;

	unsigned int		checked;



	xfs_fs_measure_sickness(mp, &sick, &checked);

	if (sick & XFS_SICK_FS_PRIMARY)

		xchk_set_corrupt(sc);



	xfs_rt_measure_sickness(mp, &sick, &checked);

	if (sick & XFS_SICK_RT_PRIMARY)

		xchk_set_corrupt(sc);



	for_each_perag(mp, agno, pag) {

		xfs_ag_measure_sickness(pag, &sick, &checked);

		if (sick & XFS_SICK_AG_PRIMARY)

			xchk_set_corrupt(sc);

	}



	return 0;

}

fs/xfs/scrub/health.h

+1 −0
Original line number Diff line number Diff line
@@ -12,5 +12,6 @@ bool xchk_ag_btree_healthy_enough(struct xfs_scrub *sc, struct xfs_perag *pag, 
		xfs_btnum_t btnum);

void xchk_mark_healthy_if_clean(struct xfs_scrub *sc, unsigned int mask);

bool xchk_file_looks_zapped(struct xfs_scrub *sc, unsigned int mask);

int xchk_health_record(struct xfs_scrub *sc);



#endif /* __XFS_SCRUB_HEALTH_H__ */

fs/xfs/scrub/repair.c

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include "xfs_errortag.h"

#include "xfs_error.h"

#include "xfs_reflink.h"

#include "xfs_health.h"

#include "scrub/scrub.h"

#include "scrub/common.h"

#include "scrub/trace.h"

fs/xfs/scrub/scrub.c

+6 −0
Original line number Diff line number Diff line
@@ -378,6 +378,12 @@ static const struct xchk_meta_ops meta_scrub_ops[] = { 
		.scrub	= xchk_nlinks,

		.repair	= xrep_nlinks,

	},

	[XFS_SCRUB_TYPE_HEALTHY] = {	/* fs healthy; clean all reminders */

		.type	= ST_FS,

		.setup	= xchk_setup_fs,

		.scrub	= xchk_health_record,

		.repair = xrep_notsupported,

	},

};



static int