xfs_scrub: remove scrub_metadata_file

Collapse this function with scrub_meta_type.

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

diff --git a/scrub/phase2.c b/scrub/phase2.c
index 4d4552d8477b5bce8673c55192469199d29cef13..4d90291ed1477616f327d19b5e385497094352f9 100644 (file)
--- a/scrub/phase2.c
+++ b/scrub/phase2.c
@@ -131,7 +131,7 @@ scan_fs_metadata(
                goto out;
 
        scrub_item_init_fs(&sri);
-       ret = scrub_fs_metadata(ctx, type, &sri);
+       ret = scrub_meta_type(ctx, type, &sri);
        if (ret) {
                sctl->aborted = true;
                goto out;

diff --git a/scrub/scrub.c b/scrub/scrub.c
index ca3eea42eceda39b41ad1d9b3f98168c934c368e..5c14ed2092eba725f19c57b4f9aefd41b52026eb 100644 (file)
--- a/scrub/scrub.c
+++ b/scrub/scrub.c
@@ -317,18 +317,6 @@ scrub_ag_metadata(
        return scrub_group(ctx, XFROG_SCRUB_GROUP_PERAG, sri);
 }
 
-/* Scrub whole-filesystem metadata. */
-int
-scrub_fs_metadata(
-       struct scrub_ctx                *ctx,
-       unsigned int                    type,
-       struct scrub_item               *sri)
-{
-       ASSERT(xfrog_scrubbers[type].group == XFROG_SCRUB_GROUP_FS);
-
-       return scrub_meta_type(ctx, type, sri);
-}
-
 /* Scrub all FS summary metadata. */
 int
 scrub_summary_metadata(

diff --git a/scrub/scrub.h b/scrub/scrub.h
index b2e91efac704dbb5004780d2c3eeb761e490cfdb..874e1fe131917e9e4e85cb89eb42649f99d4064c 100644 (file)
--- a/scrub/scrub.h
+++ b/scrub/scrub.h
@@ -82,8 +82,6 @@ void scrub_item_dump(struct scrub_item *sri, unsigned int group_mask,
 void scrub_report_preen_triggers(struct scrub_ctx *ctx);
 int scrub_ag_headers(struct scrub_ctx *ctx, struct scrub_item *sri);
 int scrub_ag_metadata(struct scrub_ctx *ctx, struct scrub_item *sri);
-int scrub_fs_metadata(struct scrub_ctx *ctx, unsigned int scrub_type,
-               struct scrub_item *sri);
 int scrub_iscan_metadata(struct scrub_ctx *ctx, struct scrub_item *sri);
 int scrub_summary_metadata(struct scrub_ctx *ctx, struct scrub_item *sri);
 int scrub_meta_type(struct scrub_ctx *ctx, unsigned int type,