xfs_db: enable conversion of rt space units

Teach the xfs_db convert function about realtime extents, blocks, and
realtime group numbers.

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

diff --git a/db/convert.c b/db/convert.c
index 7c0b1edc2358d1057dd827bcc55de2cc5bece1e8..78bd5e7492bd8094902407f94ddc3d5593f86eed 100644 (file)
--- a/db/convert.c
+++ b/db/convert.c
@@ -34,6 +34,10 @@
        rtblock_to_bytes(rtx_to_rtblock(xfs_rbmblock_to_rtx(mp, (uint64_t)x)))
 #define rbmword_to_bytes(x)    \
        rtblock_to_bytes(rtx_to_rtblock((uint64_t)(x) << XFS_NBWORDLOG))
+#define        rgblock_to_bytes(x)     \
+       ((uint64_t)(x) << mp->m_sb.sb_blocklog)
+#define        rgnumber_to_bytes(x)    \
+       rgblock_to_bytes((uint64_t)(x) * mp->m_rgblocks)
 
 typedef enum {
        CT_NONE = -1,
@@ -55,6 +59,8 @@ typedef enum {
        CT_RSUMBLOCK,           /* block within rt summary */
        CT_RSUMLOG,             /* log level for rtsummary computations */
        CT_RSUMINFO,            /* info word within rt summary */
+       CT_RGBLOCK,             /* xfs_rgblock_t */
+       CT_RGNUMBER,            /* xfs_rgno_t */
        NCTS
 } ctype_t;
 
@@ -80,6 +86,8 @@ typedef union {
        xfs_fileoff_t   rbmblock;
        unsigned int    rbmword;
        xfs_fileoff_t   rsumblock;
+       xfs_rgnumber_t  rgnumber;
+       xfs_rgblock_t   rgblock;
 } cval_t;
 
 static uint64_t                bytevalue(ctype_t ctype, cval_t *val);
@@ -95,7 +103,7 @@ static const char    *agnumber_names[] = { "agnumber", "agno", NULL };
 static const char      *bboff_names[] = { "bboff", "daddroff", NULL };
 static const char      *blkoff_names[] = { "blkoff", "fsboff", "agboff",
                                            NULL };
-static const char      *rtblkoff_names[] = { "blkoff", "rtboff",
+static const char      *rtblkoff_names[] = { "blkoff", "rtboff", "rgboff",
                                            NULL };
 static const char      *byte_names[] = { "byte", "fsbyte", NULL };
 static const char      *daddr_names[] = { "daddr", "bb", NULL };
@@ -111,6 +119,8 @@ static const char   *rbmword_names[] = { "rbmword", "rbmw", NULL };
 static const char      *rsumblock_names[] = { "rsumblock", "rsmb", NULL };
 static const char      *rsumlog_names[] = { "rsumlog", "rsml", NULL };
 static const char      *rsumword_names[] = { "rsuminfo", "rsmi", NULL };
+static const char      *rgblock_names[] = { "rgblock", "rgbno", NULL };
+static const char      *rgnumber_names[] = { "rgnumber", "rgno", NULL };
 
 static int             rsuminfo;
 static int             rsumlog;
@@ -208,6 +218,14 @@ static const ctydesc_t     ctydescs_rt[NCTS] = {
                .allowed = M(RSUMBLOCK),
                .names   = rsumword_names,
        },
+       [CT_RGBLOCK] = {
+               .allowed = M(RGNUMBER)|M(BBOFF)|M(BLKOFF)|M(RSUMLOG),
+               .names   = rgblock_names,
+       },
+       [CT_RGNUMBER] = {
+               .allowed = M(RGBLOCK)|M(BBOFF)|M(BLKOFF)|M(RSUMLOG),
+               .names   = rgnumber_names,
+       },
 };
 
 static const cmdinfo_t convert_cmd =
@@ -295,6 +313,10 @@ bytevalue(ctype_t ctype, cval_t *val)
                 * value.
                 */
                return 0;
+       case CT_RGBLOCK:
+               return rgblock_to_bytes(val->rgblock);
+       case CT_RGNUMBER:
+               return rgnumber_to_bytes(val->rgnumber);
        case CT_NONE:
        case NCTS:
                break;
@@ -401,6 +423,8 @@ convert_f(int argc, char **argv)
        case CT_RSUMBLOCK:
        case CT_RSUMLOG:
        case CT_RSUMINFO:
+       case CT_RGBLOCK:
+       case CT_RGNUMBER:
                /* shouldn't get here */
                ASSERT(0);
                break;
@@ -459,6 +483,26 @@ rt_daddr_to_rsuminfo(
        return xfs_rtsumoffs_to_infoword(mp, rsumoff);
 }
 
+static inline xfs_rgnumber_t
+xfs_daddr_to_rgno(
+       struct xfs_mount        *mp,
+       xfs_daddr_t             daddr)
+{
+       xfs_rtblock_t           rtb = daddr >> mp->m_blkbb_log;
+
+       return xfs_rtb_to_rgno(mp, rtb);
+}
+
+static inline xfs_rgblock_t
+xfs_daddr_to_rgbno(
+       struct xfs_mount        *mp,
+       xfs_daddr_t             daddr)
+{
+       xfs_rtblock_t           rtb = daddr >> mp->m_blkbb_log;
+
+       return xfs_rtb_to_rgbno(mp, rtb);
+}
+
 static int
 rtconvert_f(int argc, char **argv)
 {
@@ -551,6 +595,12 @@ rtconvert_f(int argc, char **argv)
        case CT_RSUMINFO:
                v = rt_daddr_to_rsuminfo(mp, v);
                break;
+       case CT_RGBLOCK:
+               v = xfs_daddr_to_rgbno(mp, v >> BBSHIFT);
+               break;
+       case CT_RGNUMBER:
+               v = xfs_daddr_to_rgno(mp, v >> BBSHIFT);
+               break;
        case CT_AGBLOCK:
        case CT_AGINO:
        case CT_AGNUMBER:
@@ -643,6 +693,12 @@ getvalue(char *s, ctype_t ctype, cval_t *val)
        case CT_RSUMINFO:
                rsuminfo = (unsigned int)v;
                break;
+       case CT_RGBLOCK:
+               val->rgblock = (xfs_rgblock_t)v;
+               break;
+       case CT_RGNUMBER:
+               val->rgnumber = (xfs_rgnumber_t)v;
+               break;
        case CT_NONE:
        case NCTS:
                /* NOTREACHED */

diff --git a/man/man8/xfs_db.8 b/man/man8/xfs_db.8
index ab58a147fd9e237adddee1b2eae5c2f2f4715833..04ab1893ee75044d58edc5fdde2ae305480eb1d7 100644 (file)
--- a/man/man8/xfs_db.8
+++ b/man/man8/xfs_db.8
@@ -1165,6 +1165,16 @@ with alternate names, are:
 .RS 1.0i
 .PD 0
 .HP
+.B rgblock
+or
+.B rgbno
+(realtime block within a realtime group)
+.HP
+.B rgnumber
+or
+.B rgno
+(realtime group number)
+.HP
 .B bboff
 or
 .B daddroff
@@ -1232,6 +1242,13 @@ or
 .RE
 .IP
 Only conversions that "make sense" are allowed.
+The compound form (with more than three arguments) is useful for
+conversions such as
+.B convert rgno
+.I rg
+.B rgbno
+.I rgb
+.BR rtblock .
 
 Realtime summary file location conversions have the following rules:
 Each info word in the rt summary file counts the number of free extents of a