On Mon, Apr 02, 2018 at 12:57:11PM -0700, Darrick J. Wong wrote: > From: Darrick J. Wong <darrick.wong@xxxxxxxxxx> > > Plumb in the pieces necessary to make the "scrub" subfunction of > the scrub ioctl actually work. This means that we make the IFLAG_REPAIR > flag to the scrub ioctl actually do something, and we add an errortag > knob so that xfstests can force the kernel to rebuild a metadata > structure even if there's nothing wrong with it. > > Signed-off-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx> Minor nit: > +#ifndef __XFS_SCRUB_REPAIR_H__ > +#define __XFS_SCRUB_REPAIR_H__ > + > +#ifdef CONFIG_XFS_ONLINE_REPAIR > + > +int xfs_repair_probe(struct xfs_scrub_context *sc); > + > +#else > + > +#define xfs_repair_probe (NULL) static inline that returns -EOPNOTSUPP? That way this code: .... > +/* > + * Attempt to repair some metadata, if the metadata is corrupt and userspace > + * told us to fix it. This function returns -EAGAIN to mean "re-run scrub", > + * and will set *fixed to true if it thinks it repaired anything. > + */ > +STATIC int > +xfs_repair_attempt( > + struct xfs_inode *ip, > + struct xfs_scrub_context *sc, > + bool *fixed) > +{ > + int error = 0; > + > + trace_xfs_repair_attempt(ip, sc->sm, error); > + > + /* Repair needed but not supported, just exit. */ > + if (!sc->ops->repair) { > + error = -EOPNOTSUPP; > + trace_xfs_repair_done(ip, sc->sm, error); > + return error; > + } Can go away completely as there would be no need to special case the "repair not build in" configuration here. Otherwise it looks ok. Reviewed-by: Dave Chinner <dchinner@xxxxxxxxxx> -- Dave Chinner david@xxxxxxxxxxxxx -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html