From: Darrick J. Wong Date: Mon, 29 Jul 2024 23:23:06 +0000 (-0700) Subject: xfs_scrub: remove scrub_metadata_file X-Git-Tag: v6.10.0~18^2~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ca06c565da8f37f7e04a19aa2f4090bc0aa532a4;p=thirdparty%2Fxfsprogs-dev.git xfs_scrub: remove scrub_metadata_file Collapse this function with scrub_meta_type. Signed-off-by: Darrick J. Wong Reviewed-by: Christoph Hellwig --- diff --git a/scrub/phase2.c b/scrub/phase2.c index 4d4552d8..4d90291e 100644 --- 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 ca3eea42..5c14ed20 100644 --- 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 b2e91efa..874e1fe1 100644 --- 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,