xfs_scrub: separate internal metadata scrub functions

Refactor xfs_scrub_metadata into two functions -- one to make a single
call xfs_check_metadata, and the second retains the loop logic.  The
name is a little easy to confuse with other functions, so rename it to
reflect what it actually does: scrub all internal metadata of a given
class (AG header, AG metadata, FS metadata).  No functional changes.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/scrub/scrub.c b/scrub/scrub.c
index 083ed9a1b7d192f34cccbd712cece43fedbcdaef..2557da2accd8adb34e45c2eb3264879698946675 100644 (file)
--- a/scrub/scrub.c
+++ b/scrub/scrub.c
@@ -276,47 +276,68 @@ xfs_scrub_save_repair(
        return true;
 }
 
-/* Scrub metadata, saving corruption reports for later. */
+/* Scrub a single XFS_SCRUB_TYPE_*, saving corruption reports for later. */
+static int
+xfs_scrub_meta_type(
+       struct scrub_ctx                *ctx,
+       unsigned int                    type,
+       xfs_agnumber_t                  agno,
+       struct xfs_action_list          *alist)
+{
+       struct xfs_scrub_metadata       meta = {
+               .sm_type                = type,
+               .sm_agno                = agno,
+       };
+       enum check_outcome              fix;
+
+       background_sleep();
+
+       /* Check the item. */
+       fix = xfs_check_metadata(ctx, &meta, false);
+       progress_add(1);
+
+       switch (fix) {
+       case CHECK_ABORT:
+               return ECANCELED;
+       case CHECK_REPAIR:
+               if (!xfs_scrub_save_repair(ctx, alist, &meta))
+                       return ENOMEM;
+               /* fall through */
+       case CHECK_DONE:
+               return 0;
+       default:
+               /* CHECK_RETRY should never happen. */
+               abort();
+       }
+}
+
+/*
+ * Scrub all metadata types that are assigned to the given XFROG_SCRUB_TYPE_*,
+ * saving corruption reports for later.  This should not be used for
+ * XFROG_SCRUB_TYPE_INODE or for checking summary metadata.
+ */
 static bool
-xfs_scrub_metadata(
+xfs_scrub_all_types(
        struct scrub_ctx                *ctx,
        enum xfrog_scrub_type           scrub_type,
        xfs_agnumber_t                  agno,
        struct xfs_action_list          *alist)
 {
-       struct xfs_scrub_metadata       meta = {0};
        const struct xfrog_scrub_descr  *sc;
-       enum check_outcome              fix;
-       int                             type;
+       unsigned int                    type;
 
        sc = xfrog_scrubbers;
        for (type = 0; type < XFS_SCRUB_TYPE_NR; type++, sc++) {
+               int                     ret;
+
                if (sc->type != scrub_type)
                        continue;
                if (sc->flags & XFROG_SCRUB_DESCR_SUMMARY)
                        continue;
 
-               meta.sm_type = type;
-               meta.sm_flags = 0;
-               meta.sm_agno = agno;
-               background_sleep();
-
-               /* Check the item. */
-               fix = xfs_check_metadata(ctx, &meta, false);
-               progress_add(1);
-               switch (fix) {
-               case CHECK_ABORT:
+               ret = xfs_scrub_meta_type(ctx, type, agno, alist);
+               if (ret)
                        return false;
-               case CHECK_REPAIR:
-                       if (!xfs_scrub_save_repair(ctx, alist, &meta))
-                               return false;
-                       /* fall through */
-               case CHECK_DONE:
-                       continue;
-               case CHECK_RETRY:
-                       abort();
-                       break;
-               }
        }
 
        return true;
@@ -332,28 +353,10 @@ xfs_scrub_primary_super(
        struct scrub_ctx                *ctx,
        struct xfs_action_list          *alist)
 {
-       struct xfs_scrub_metadata       meta = {
-               .sm_type = XFS_SCRUB_TYPE_SB,
-       };
-       enum check_outcome              fix;
+       int                             ret;
 
-       /* Check the item. */
-       fix = xfs_check_metadata(ctx, &meta, false);
-       switch (fix) {
-       case CHECK_ABORT:
-               return false;
-       case CHECK_REPAIR:
-               if (!xfs_scrub_save_repair(ctx, alist, &meta))
-                       return false;
-               /* fall through */
-       case CHECK_DONE:
-               return true;
-       case CHECK_RETRY:
-               abort();
-               break;
-       }
-
-       return true;
+       ret = xfs_scrub_meta_type(ctx, XFS_SCRUB_TYPE_SB, 0, alist);
+       return ret == 0;
 }
 
 /* Scrub each AG's header blocks. */
@@ -363,7 +366,7 @@ xfs_scrub_ag_headers(
        xfs_agnumber_t                  agno,
        struct xfs_action_list          *alist)
 {
-       return xfs_scrub_metadata(ctx, XFROG_SCRUB_TYPE_AGHEADER, agno, alist);
+       return xfs_scrub_all_types(ctx, XFROG_SCRUB_TYPE_AGHEADER, agno, alist);
 }
 
 /* Scrub each AG's metadata btrees. */
@@ -373,7 +376,7 @@ xfs_scrub_ag_metadata(
        xfs_agnumber_t                  agno,
        struct xfs_action_list          *alist)
 {
-       return xfs_scrub_metadata(ctx, XFROG_SCRUB_TYPE_PERAG, agno, alist);
+       return xfs_scrub_all_types(ctx, XFROG_SCRUB_TYPE_PERAG, agno, alist);
 }
 
 /* Scrub whole-FS metadata btrees. */
@@ -382,7 +385,7 @@ xfs_scrub_fs_metadata(
        struct scrub_ctx                *ctx,
        struct xfs_action_list          *alist)
 {
-       return xfs_scrub_metadata(ctx, XFROG_SCRUB_TYPE_FS, 0, alist);
+       return xfs_scrub_all_types(ctx, XFROG_SCRUB_TYPE_FS, 0, alist);
 }
 
 /* How many items do we have to check? */