xfs_io: add a command to display realtime group information

Add a new 'rginfo' command to xfs_io so that we can display realtime
group geometry.

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

diff --git a/io/aginfo.c b/io/aginfo.c
index 6cbfcb8de3552331f828dab64ed4766765ca44da..43e0e9c21b837af15c87fcc49b6c625c8f681661 100644 (file)
--- a/io/aginfo.c
+++ b/io/aginfo.c
@@ -14,6 +14,7 @@
 #include "libfrog/fsgeom.h"
 
 static cmdinfo_t aginfo_cmd;
+static cmdinfo_t rginfo_cmd;
 
 static int
 report_aginfo(
@@ -111,9 +112,104 @@ static cmdinfo_t aginfo_cmd = {
        .help = aginfo_help,
 };
 
+static int
+report_rginfo(
+       struct xfs_fd           *xfd,
+       xfs_rgnumber_t          rgno)
+{
+       struct xfs_rtgroup_geometry     rgeo = { 0 };
+       int                     ret;
+
+       ret = -xfrog_rtgroup_geometry(xfd->fd, rgno, &rgeo);
+       if (ret) {
+               xfrog_perror(ret, "rginfo");
+               return 1;
+       }
+
+       printf(_("RG: %u\n"),           rgeo.rg_number);
+       printf(_("Blocks: %u\n"),       rgeo.rg_length);
+       printf(_("Sick: 0x%x\n"),       rgeo.rg_sick);
+       printf(_("Checked: 0x%x\n"),    rgeo.rg_checked);
+       printf(_("Flags: 0x%x\n"),      rgeo.rg_flags);
+
+       return 0;
+}
+
+/* Display rtgroup status. */
+static int
+rginfo_f(
+       int                     argc,
+       char                    **argv)
+{
+       struct xfs_fd           xfd = XFS_FD_INIT(file->fd);
+       unsigned long long      x;
+       xfs_rgnumber_t          rgno = NULLRGNUMBER;
+       int                     c;
+       int                     ret = 0;
+
+       ret = -xfd_prepare_geometry(&xfd);
+       if (ret) {
+               xfrog_perror(ret, "xfd_prepare_geometry");
+               exitcode = 1;
+               return 1;
+       }
+
+       while ((c = getopt(argc, argv, "r:")) != EOF) {
+               switch (c) {
+               case 'r':
+                       errno = 0;
+                       x = strtoll(optarg, NULL, 10);
+                       if (!errno && x >= NULLRGNUMBER)
+                               errno = ERANGE;
+                       if (errno) {
+                               perror("rginfo");
+                               return 1;
+                       }
+                       rgno = x;
+                       break;
+               default:
+                       return command_usage(&rginfo_cmd);
+               }
+       }
+
+       if (rgno != NULLRGNUMBER) {
+               ret = report_rginfo(&xfd, rgno);
+       } else {
+               for (rgno = 0; !ret && rgno < xfd.fsgeom.rgcount; rgno++) {
+                       ret = report_rginfo(&xfd, rgno);
+               }
+       }
+
+       return ret;
+}
+
+static void
+rginfo_help(void)
+{
+       printf(_(
+"\n"
+"Report realtime group geometry.\n"
+"\n"
+" -r rgno  -- Report on the given realtime group.\n"
+"\n"));
+
+}
+
+static cmdinfo_t rginfo_cmd = {
+       .name = "rginfo",
+       .cfunc = rginfo_f,
+       .argmin = 0,
+       .argmax = -1,
+       .args = "[-r rgno]",
+       .flags = CMD_NOMAP_OK,
+       .help = rginfo_help,
+};
+
 void
 aginfo_init(void)
 {
        aginfo_cmd.oneline = _("Get XFS allocation group state.");
        add_command(&aginfo_cmd);
+       rginfo_cmd.oneline = _("Get XFS realtime group state.");
+       add_command(&rginfo_cmd);
 }

diff --git a/libfrog/fsgeom.c b/libfrog/fsgeom.c
index 9c1e9a90eb1f1b39ed0f88fb760bd7080d3f4dd4..b5220d2d6ffd2295ccd5909f1a26a630cd12b699 100644 (file)
--- a/libfrog/fsgeom.c
+++ b/libfrog/fsgeom.c
@@ -214,3 +214,21 @@ xfrog_ag_geometry(
                return -errno;
        return 0;
 }
+
+/*
+ * Try to obtain a rt group's geometry.  Returns zero or a negative error code.
+ */
+int
+xfrog_rtgroup_geometry(
+       int                     fd,
+       unsigned int            rgno,
+       struct xfs_rtgroup_geometry     *rgeo)
+{
+       int                     ret;
+
+       rgeo->rg_number = rgno;
+       ret = ioctl(fd, XFS_IOC_RTGROUP_GEOMETRY, rgeo);
+       if (ret)
+               return -errno;
+       return 0;
+}

diff --git a/libfrog/fsgeom.h b/libfrog/fsgeom.h
index df2ca2a408e78a99e1d50112648eb074b4d277e0..c571ddbcfb9b7019935d1e968d36d83116274a8a 100644 (file)
--- a/libfrog/fsgeom.h
+++ b/libfrog/fsgeom.h
@@ -5,10 +5,14 @@
 #ifndef __LIBFROG_FSGEOM_H__
 #define __LIBFROG_FSGEOM_H__
 
+struct xfs_rtgroup_geometry;
+
 void xfs_report_geom(struct xfs_fsop_geom *geo, const char *mntpoint,
                const char *logname, const char *rtname);
 int xfrog_geometry(int fd, struct xfs_fsop_geom *fsgeo);
 int xfrog_ag_geometry(int fd, unsigned int agno, struct xfs_ag_geometry *ageo);
+int xfrog_rtgroup_geometry(int fd, unsigned int rgno,
+               struct xfs_rtgroup_geometry *rgeo);
 
 /*
  * Structure for recording whatever observations we want about the level of

diff --git a/man/man8/xfs_io.8 b/man/man8/xfs_io.8
index dfec71ae98648357b0fe84d1783cd032254bf0c1..de114351bbe5c825d342eaa00b2c347dd3b1e3d6 100644 (file)
--- a/man/man8/xfs_io.8
+++ b/man/man8/xfs_io.8
@@ -1322,6 +1322,19 @@ specific points under adverse conditions. Without the
 .I tag
 argument, displays the list of error tags available.
 Only available in expert mode and requires privileges.
+
+.TP
+.BI "rginfo [ \-r " rgno " ]"
+Show information about or update the state of realtime allocation groups.
+.RE
+.RS 1.0i
+.PD 0
+.TP
+.BI \-r
+Act only on a specific realtime group.
+.PD
+.RE
+
 .TP
 .BI "resblks [ " blocks " ]"
 Get and/or set count of reserved filesystem blocks using the