xfs_scrub: check rtgroup metadata directory connections

Run the rtgroup metapath scrubber during phase 5 to ensure that any
rtgroup metadata files are still connected to the metadir tree after
we've pruned any bad links.

Signed-off-by: "Darrick J. Wong" <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>

diff --git a/scrub/phase5.c b/scrub/phase5.c
index 4d0a76a529b55dc890e3852310fc56802fa2ecd3..22a22915dbc68dd5707e541a0c5aaf25b720379c 100644 (file)
--- a/scrub/phase5.c
+++ b/scrub/phase5.c
@@ -750,6 +750,7 @@ static int
 queue_metapath_scan(
        struct workqueue        *wq,
        bool                    *abortedp,
+       xfs_rgnumber_t          rgno,
        uint64_t                type)
 {
        struct fs_scan_item     *item;
@@ -762,7 +763,7 @@ queue_metapath_scan(
                str_liberror(ctx, ret, _("setting up metapath scan"));
                return ret;
        }
-       scrub_item_init_metapath(&item->sri, type);
+       scrub_item_init_metapath(&item->sri, rgno, type);
        scrub_item_schedule(&item->sri, XFS_SCRUB_TYPE_METAPATH);
        item->abortedp = abortedp;
 
@@ -785,6 +786,7 @@ run_kernel_metadir_path_scrubbers(
        const struct xfrog_scrub_descr  *sc;
        uint64_t                type;
        unsigned int            nr_threads = scrub_nproc_workqueue(ctx);
+       xfs_rgnumber_t          rgno;
        bool                    aborted = false;
        int                     ret, ret2;
 
@@ -804,7 +806,7 @@ run_kernel_metadir_path_scrubbers(
                if (sc->group != XFROG_SCRUB_GROUP_FS)
                        continue;
 
-               ret = queue_metapath_scan(&wq, &aborted, type);
+               ret = queue_metapath_scan(&wq, &aborted, 0, type);
                if (ret) {
                        str_liberror(ctx, ret,
  _("queueing metapath scrub work"));
@@ -812,6 +814,24 @@ run_kernel_metadir_path_scrubbers(
                }
        }
 
+       /* Scan all rtgroup metadata files */
+       for (rgno = 0;
+            rgno < ctx->mnt.fsgeom.rgcount && !aborted;
+            rgno++) {
+               for (type = 0; type < XFS_SCRUB_METAPATH_NR; type++) {
+                       sc = &xfrog_metapaths[type];
+                       if (sc->group != XFROG_SCRUB_GROUP_RTGROUP)
+                               continue;
+
+                       ret = queue_metapath_scan(&wq, &aborted, rgno, type);
+                       if (ret) {
+                               str_liberror(ctx, ret,
+  _("queueing metapath scrub work"));
+                               goto wait;
+                       }
+               }
+       }
+
 wait:
        ret2 = -workqueue_terminate(&wq);
        if (ret2) {

diff --git a/scrub/scrub.h b/scrub/scrub.h
index bb94a11dcfce71b275656425e290f84a2e8f4664..24b5ad629c5158f51eadc5c0f44440882b3aadd6 100644 (file)
--- a/scrub/scrub.h
+++ b/scrub/scrub.h
@@ -118,9 +118,11 @@ scrub_item_init_file(struct scrub_item *sri, const struct xfs_bulkstat *bstat)
 }
 
 static inline void
-scrub_item_init_metapath(struct scrub_item *sri, uint64_t metapath)
+scrub_item_init_metapath(struct scrub_item *sri, xfs_rgnumber_t rgno,
+               uint64_t metapath)
 {
        memset(sri, 0, sizeof(*sri));
+       sri->sri_agno = rgno;
        sri->sri_ino = metapath;
 }