On Thu, May 10, 2018 at 09:54:59AM -0400, Brian Foster wrote:
> On Thu, May 03, 2018 at 11:06:38AM -0700, Darrick J. Wong wrote:
> > From: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
> >
> > The realtime bitmap and summary inodes live on the metadata device, so
> > we can scrub their data forks with the regular scrubbers.
> >
> > Signed-off-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
> > ---
> > fs/xfs/scrub/rtbitmap.c | 26 +++++++++++++++++++++++++-
> > 1 file changed, 25 insertions(+), 1 deletion(-)
> >
> >
> > diff --git a/fs/xfs/scrub/rtbitmap.c b/fs/xfs/scrub/rtbitmap.c
> > index 8b048f107af2..b2b4dff2660d 100644
> > --- a/fs/xfs/scrub/rtbitmap.c
> > +++ b/fs/xfs/scrub/rtbitmap.c
> > @@ -82,6 +82,11 @@ xfs_scrub_rtbitmap(
> > {
> > int error;
> >
> > + /* Invoke the fork scrubber. */
> > + error = xfs_scrub_metadata_inode_forks(sc);
> > + if (error || (sc->sm->sm_flags & XFS_SCRUB_OFLAG_CORRUPT))
> > + return error;
> > +
> > error = xfs_rtalloc_query_all(sc->tp, xfs_scrub_rtbitmap_rec, sc);
> > if (!xfs_scrub_fblock_process_error(sc, XFS_DATA_FORK, 0, &error))
> > goto out;
> > @@ -95,8 +100,27 @@ int
> > xfs_scrub_rtsummary(
> > struct xfs_scrub_context *sc)
> > {
> > + struct xfs_inode *rsumip = sc->mp->m_rsumip;
> > + int error = 0;
> > +
> > + /*
> > + * We ILOCK'd the rt bitmap ip in the setup routine, now lock the
> > + * rt summary ip in compliance with the rt inode locking rules.
> > + */
> > + xfs_ilock(rsumip, XFS_ILOCK_EXCL | XFS_ILOCK_RTSUM);
> > +
> > + /* Invoke the fork scrubber. */
> > + sc->ip = rsumip;
>
> I guess the ->ilock_flags are technically inconsistent at this point.
> Does that matter? If not, couldn't hurt to document that in the comment.
> ;P
>
> I also think this would be a bit easier to follow if we just stored and
> restored an old_ip pointer on the stack (and perhaps assert that it
> matches ->m_rbmip).
Ok. I'll update the documentation to make it clearer that we're
switching state, and restructure the code to keep sc->{ip,ilock_flags}
consistent.
--D
> Brian
>
> > + error = xfs_scrub_metadata_inode_forks(sc);
> > + sc->ip = sc->mp->m_rbmip;
> > + if (error || (sc->sm->sm_flags & XFS_SCRUB_OFLAG_CORRUPT))
> > + goto out;
> > +
> > /* XXX: implement this some day */
> > - return -ENOENT;
> > + xfs_scrub_set_incomplete(sc);
> > +out:
> > + xfs_iunlock(rsumip, XFS_ILOCK_EXCL | XFS_ILOCK_RTSUM);
> > + return error;
> > }
> >
> >
> >
> > --
> > 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
> --
> 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
--
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
