From: Darrick J. Wong <djwong@xxxxxxxxxx>
The only members of XFROG_SCRUB_GROUP_FS are metadata files. Although
each of these files have full-filesystem scope, let's rename the group
so that it's more obvious that the group scans metadata files, not the
entire fs.
Signed-off-by: Darrick J. Wong <djwong@xxxxxxxxxx>
---
io/scrub.c | 6 +++---
libfrog/scrub.c | 10 +++++-----
libfrog/scrub.h | 2 +-
scrub/scrub.c | 6 +++---
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/io/scrub.c b/io/scrub.c
index 4cfa4bc3c4c..3971a9fedb5 100644
--- a/io/scrub.c
+++ b/io/scrub.c
@@ -66,7 +66,7 @@ scrub_ioctl(
meta.sm_gen = control2;
break;
case XFROG_SCRUB_GROUP_NONE:
- case XFROG_SCRUB_GROUP_FS:
+ case XFROG_SCRUB_GROUP_METAFILES:
case XFROG_SCRUB_GROUP_SUMMARY:
/* no control parameters */
break;
@@ -167,7 +167,7 @@ parse_args(
return 0;
}
break;
- case XFROG_SCRUB_GROUP_FS:
+ case XFROG_SCRUB_GROUP_METAFILES:
case XFROG_SCRUB_GROUP_NONE:
case XFROG_SCRUB_GROUP_SUMMARY:
if (optind != argc) {
@@ -260,7 +260,7 @@ repair_ioctl(
meta.sm_gen = control2;
break;
case XFROG_SCRUB_GROUP_NONE:
- case XFROG_SCRUB_GROUP_FS:
+ case XFROG_SCRUB_GROUP_METAFILES:
case XFROG_SCRUB_GROUP_SUMMARY:
/* no control parameters */
break;
diff --git a/libfrog/scrub.c b/libfrog/scrub.c
index 5a5f522a425..2e4d96caaa1 100644
--- a/libfrog/scrub.c
+++ b/libfrog/scrub.c
@@ -107,27 +107,27 @@ const struct xfrog_scrub_descr xfrog_scrubbers[XFS_SCRUB_TYPE_NR] = {
[XFS_SCRUB_TYPE_RTBITMAP] = {
.name = "rtbitmap",
.descr = "realtime bitmap",
- .group = XFROG_SCRUB_GROUP_FS,
+ .group = XFROG_SCRUB_GROUP_METAFILES,
},
[XFS_SCRUB_TYPE_RTSUM] = {
.name = "rtsummary",
.descr = "realtime summary",
- .group = XFROG_SCRUB_GROUP_FS,
+ .group = XFROG_SCRUB_GROUP_METAFILES,
},
[XFS_SCRUB_TYPE_UQUOTA] = {
.name = "usrquota",
.descr = "user quotas",
- .group = XFROG_SCRUB_GROUP_FS,
+ .group = XFROG_SCRUB_GROUP_METAFILES,
},
[XFS_SCRUB_TYPE_GQUOTA] = {
.name = "grpquota",
.descr = "group quotas",
- .group = XFROG_SCRUB_GROUP_FS,
+ .group = XFROG_SCRUB_GROUP_METAFILES,
},
[XFS_SCRUB_TYPE_PQUOTA] = {
.name = "prjquota",
.descr = "project quotas",
- .group = XFROG_SCRUB_GROUP_FS,
+ .group = XFROG_SCRUB_GROUP_METAFILES,
},
[XFS_SCRUB_TYPE_FSCOUNTERS] = {
.name = "fscounters",
diff --git a/libfrog/scrub.h b/libfrog/scrub.h
index 68f1a968103..14c4857bede 100644
--- a/libfrog/scrub.h
+++ b/libfrog/scrub.h
@@ -11,7 +11,7 @@ enum xfrog_scrub_group {
XFROG_SCRUB_GROUP_NONE, /* not metadata */
XFROG_SCRUB_GROUP_AGHEADER, /* per-AG header */
XFROG_SCRUB_GROUP_PERAG, /* per-AG metadata */
- XFROG_SCRUB_GROUP_FS, /* per-FS metadata */
+ XFROG_SCRUB_GROUP_METAFILES, /* whole-fs metadata files */
XFROG_SCRUB_GROUP_INODE, /* per-inode metadata */
XFROG_SCRUB_GROUP_SUMMARY, /* summary metadata */
};
diff --git a/scrub/scrub.c b/scrub/scrub.c
index b7e120e91d6..1fcd5b8e85d 100644
--- a/scrub/scrub.c
+++ b/scrub/scrub.c
@@ -45,7 +45,7 @@ format_scrub_descr(
meta->sm_ino, meta->sm_gen, "%s",
_(sc->descr));
break;
- case XFROG_SCRUB_GROUP_FS:
+ case XFROG_SCRUB_GROUP_METAFILES:
case XFROG_SCRUB_GROUP_SUMMARY:
return snprintf(buf, buflen, _("%s"), _(sc->descr));
break;
@@ -406,7 +406,7 @@ scrub_fs_metadata(
struct scrub_ctx *ctx,
struct action_list *alist)
{
- return scrub_group(ctx, XFROG_SCRUB_GROUP_FS, 0, alist);
+ return scrub_group(ctx, XFROG_SCRUB_GROUP_METAFILES, 0, alist);
}
/* Scrub all FS summary metadata. */
@@ -443,7 +443,7 @@ scrub_estimate_ag_work(
case XFROG_SCRUB_GROUP_PERAG:
estimate += ctx->mnt.fsgeom.agcount;
break;
- case XFROG_SCRUB_GROUP_FS:
+ case XFROG_SCRUB_GROUP_METAFILES:
estimate++;
break;
default:
