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

xfs: remember sick inodes that get inactivated 



If an unhealthy inode gets inactivated, remember this fact in the
per-fs health summary.

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

fs/xfs/libxfs/xfs_fs.h

+1 −0
Original line number Diff line number Diff line
@@ -294,6 +294,7 @@ struct xfs_ag_geometry { 
#define XFS_AG_GEOM_SICK_FINOBT	(1 << 7)  /* free inode index */

#define XFS_AG_GEOM_SICK_RMAPBT	(1 << 8)  /* reverse mappings */

#define XFS_AG_GEOM_SICK_REFCNTBT (1 << 9)  /* reference counts */

#define XFS_AG_GEOM_SICK_INODES	(1 << 10) /* bad inodes were seen */



/*

 * Structures for XFS_IOC_FSGROWFSDATA, XFS_IOC_FSGROWFSLOG & XFS_IOC_FSGROWFSRT

fs/xfs/libxfs/xfs_health.h

+6 −2
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ struct xfs_da_args; 
#define XFS_SICK_AG_FINOBT	(1 << 7)  /* free inode index */

#define XFS_SICK_AG_RMAPBT	(1 << 8)  /* reverse mappings */

#define XFS_SICK_AG_REFCNTBT	(1 << 9)  /* reference counts */

#define XFS_SICK_AG_INODES	(1 << 10) /* inactivated bad inodes */



/* Observable health issues for inode metadata. */

#define XFS_SICK_INO_CORE	(1 << 0)  /* inode core */
@@ -92,6 +93,9 @@ struct xfs_da_args; 
#define XFS_SICK_INO_DIR_ZAPPED		(1 << 10) /* directory erased */

#define XFS_SICK_INO_SYMLINK_ZAPPED	(1 << 11) /* symlink erased */



/* Don't propagate sick status to ag health summary during inactivation */

#define XFS_SICK_INO_FORGET	(1 << 12)



/* Primary evidence of health problems in a given group. */

#define XFS_SICK_FS_PRIMARY	(XFS_SICK_FS_COUNTERS | \

				 XFS_SICK_FS_UQUOTA | \
@@ -132,12 +136,12 @@ struct xfs_da_args; 
#define XFS_SICK_FS_SECONDARY	(0)

#define XFS_SICK_RT_SECONDARY	(0)

#define XFS_SICK_AG_SECONDARY	(0)

#define XFS_SICK_INO_SECONDARY	(0)

#define XFS_SICK_INO_SECONDARY	(XFS_SICK_INO_FORGET)



/* Evidence of health problems elsewhere. */

#define XFS_SICK_FS_INDIRECT	(0)

#define XFS_SICK_RT_INDIRECT	(0)

#define XFS_SICK_AG_INDIRECT	(0)

#define XFS_SICK_AG_INDIRECT	(XFS_SICK_AG_INODES)

#define XFS_SICK_INO_INDIRECT	(0)



/* All health masks. */

fs/xfs/libxfs/xfs_inode_buf.c

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ xfs_imap_to_bp( 
			imap->im_len, XBF_UNMAPPED, bpp, &xfs_inode_buf_ops);

	if (xfs_metadata_is_sick(error))

		xfs_agno_mark_sick(mp, xfs_daddr_to_agno(mp, imap->im_blkno),

				XFS_SICK_AG_INOBT);

				XFS_SICK_AG_INODES);

	return error;

}

fs/xfs/scrub/health.c

+13 −3
Original line number Diff line number Diff line
@@ -183,9 +183,19 @@ xchk_update_health( 
	case XHG_INO:

		if (!sc->ip)

			return;

		if (bad)

			xfs_inode_mark_corrupt(sc->ip, sc->sick_mask);

		else

		if (bad) {

			unsigned int	mask = sc->sick_mask;



			/*

			 * If we're coming in for repairs then we don't want

			 * sickness flags to propagate to the incore health

			 * status if the inode gets inactivated before we can

			 * fix it.

			 */

			if (sc->sm->sm_flags & XFS_SCRUB_IFLAG_REPAIR)

				mask |= XFS_SICK_INO_FORGET;

			xfs_inode_mark_corrupt(sc->ip, mask);

		} else

			xfs_inode_mark_healthy(sc->ip, sc->sick_mask);

		break;

	case XHG_FS:

fs/xfs/xfs_health.c

+1 −0
Original line number Diff line number Diff line
@@ -431,6 +431,7 @@ static const struct ioctl_sick_map ag_map[] = { 
	{ XFS_SICK_AG_FINOBT,	XFS_AG_GEOM_SICK_FINOBT },

	{ XFS_SICK_AG_RMAPBT,	XFS_AG_GEOM_SICK_RMAPBT },

	{ XFS_SICK_AG_REFCNTBT,	XFS_AG_GEOM_SICK_REFCNTBT },

	{ XFS_SICK_AG_INODES,	XFS_AG_GEOM_SICK_INODES },

	{ 0, 0 },

};