xfs: scrub each rtgroup's portion of the rtbitmap separately

Create a new scrub type code so that userspace can scrub each rtgroup's
portion of the rtbitmap file separately.  This reduces the long tail
latency that results from scanning the entire bitmap all at once, and
prepares us for future patchsets, wherein we'll need to be able to lock
a specific rtgroup so that we can rebuild that rtgroup's part of the
rtbitmap contents from the rtgroup's rmap btree.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>

diff --git a/libfrog/scrub.c b/libfrog/scrub.c
index a9aad03de0d2d85ffa74982318226ca0a2029bd6..b22770d639c255e3a6e48d8619c745bf6d585ccd 100644 (file)
--- a/libfrog/scrub.c
+++ b/libfrog/scrub.c
@@ -164,6 +164,11 @@ const struct xfrog_scrub_descr xfrog_scrubbers[XFS_SCRUB_TYPE_NR] = {
                .descr  = "realtime group superblock",
                .group  = XFROG_SCRUB_GROUP_RTGROUP,
        },
+       [XFS_SCRUB_TYPE_RGBITMAP] = {
+               .name   = "rgbitmap",
+               .descr  = "realtime group bitmap",
+               .group  = XFROG_SCRUB_GROUP_RTGROUP,
+       },
 };
 
 const struct xfrog_scrub_descr xfrog_metapaths[XFS_SCRUB_METAPATH_NR] = {

diff --git a/libxfs/xfs_fs.h b/libxfs/xfs_fs.h
index 237d13a500daf84f53adbd971ec6a939c8b94ca0..102b9273360571d824cb5270c2ebe615d4c28155 100644 (file)
--- a/libxfs/xfs_fs.h
+++ b/libxfs/xfs_fs.h
@@ -736,9 +736,10 @@ struct xfs_scrub_metadata {
 #define XFS_SCRUB_TYPE_DIRTREE 28      /* directory tree structure */
 #define XFS_SCRUB_TYPE_METAPATH        29      /* metadata directory tree paths */
 #define XFS_SCRUB_TYPE_RGSUPER 30      /* realtime superblock */
+#define XFS_SCRUB_TYPE_RGBITMAP        31      /* realtime group bitmap */
 
 /* Number of scrub subcommands. */
-#define XFS_SCRUB_TYPE_NR      31
+#define XFS_SCRUB_TYPE_NR      32
 
 /*
  * This special type code only applies to the vectored scrub implementation.

diff --git a/man/man2/ioctl_xfs_scrub_metadata.2 b/man/man2/ioctl_xfs_scrub_metadata.2
index 13f655e2b97bbceaf6175907b72a4e9f50fb1ea9..dc439897c98888d2d1b50d1cb7b955819136ae1a 100644 (file)
--- a/man/man2/ioctl_xfs_scrub_metadata.2
+++ b/man/man2/ioctl_xfs_scrub_metadata.2
@@ -97,6 +97,18 @@ The realtime allocation group number must be given in
 .IR sm_ino " and " sm_gen
 must be zero.
 
+.PP
+.TP
+.B XFS_SCRUB_TYPE_RGBITMAP
+Examine a given realtime allocation group's free space bitmap.
+Records are checked for obviously incorrect values and cross-referenced
+with other allocation group metadata records to ensure that there are no
+conflicts.
+The realtime allocation group number must be given in
+.IR sm_agno "."
+.IR sm_ino " and " sm_gen
+must be zero.
+
 .TP
 .B XFS_SCRUB_TYPE_INODE
 Examine a given inode record for obviously incorrect values and