xfs_db: convert rtbitmap geometry
Teach the rtconvert command to convert locations on the realtime device
(e.g. rt daddrs, blocks, or extents) to a file block number and word
within the rt bitmap file.
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
diff --git a/db/convert.c b/db/convert.c
index 3b2031d..c0b8e78 100644
--- a/db/convert.c
+++ b/db/convert.c
@@ -31,6 +31,10 @@
((uint64_t)(x) << mp->m_sb.sb_blocklog)
#define rtx_to_rtblock(x) \
((uint64_t)(x) * mp->m_sb.sb_rextsize)
+#define rbmblock_to_bytes(x) \
+ 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))
typedef enum {
CT_NONE = -1,
@@ -47,6 +51,8 @@
CT_INOOFF, /* byte offset in inode */
CT_RTBLOCK, /* realtime block */
CT_RTX, /* realtime extent */
+ CT_RBMBLOCK, /* block within rt bitmap */
+ CT_RBMWORD, /* word within rt bitmap */
NCTS
} ctype_t;
@@ -69,6 +75,8 @@
int inooff;
xfs_rtblock_t rtblock;
xfs_rtblock_t rtx;
+ xfs_fileoff_t rbmblock;
+ unsigned int rbmword;
} cval_t;
static uint64_t bytevalue(ctype_t ctype, cval_t *val);
@@ -95,6 +103,8 @@
static const char *rtblock_names[] = { "rtblock", "rtb", "rtbno", NULL };
static const char *rtx_names[] = { "rtx", "rtextent", NULL };
+static const char *rbmblock_names[] = { "rbmblock", "rbmb", NULL };
+static const char *rbmword_names[] = { "rbmword", "rbmw", NULL };
static const ctydesc_t ctydescs[NCTS] = {
[CT_AGBLOCK] = {
@@ -196,6 +206,14 @@
M(BLKOFF),
.names = rtx_names,
},
+ [CT_RBMBLOCK] = {
+ .allowed = M(RBMWORD),
+ .names = rbmblock_names,
+ },
+ [CT_RBMWORD] = {
+ .allowed = M(RBMBLOCK),
+ .names = rbmword_names,
+ },
};
static const cmdinfo_t convert_cmd =
@@ -236,6 +254,10 @@
return rtblock_to_bytes(val->rtblock);
case CT_RTX:
return rtblock_to_bytes(rtx_to_rtblock(val->rtx));
+ case CT_RBMBLOCK:
+ return rbmblock_to_bytes(val->rbmblock);
+ case CT_RBMWORD:
+ return rbmword_to_bytes(val->rbmword);
case CT_NONE:
case NCTS:
break;
@@ -337,6 +359,8 @@
break;
case CT_RTBLOCK:
case CT_RTX:
+ case CT_RBMBLOCK:
+ case CT_RBMWORD:
/* shouldn't get here */
ASSERT(0);
break;
@@ -418,6 +442,16 @@
case CT_RTX:
v = xfs_daddr_to_rtb(mp, v >> BBSHIFT) / mp->m_sb.sb_rextsize;
break;
+ case CT_RBMBLOCK:
+ v = xfs_rtx_to_rbmblock(mp,
+ xfs_rtb_to_rtx(mp,
+ xfs_daddr_to_rtb(mp, v >> BBSHIFT)));
+ break;
+ case CT_RBMWORD:
+ v = xfs_rtx_to_rbmword(mp,
+ xfs_rtb_to_rtx(mp,
+ xfs_daddr_to_rtb(mp, v >> BBSHIFT)));
+ break;
case CT_AGBLOCK:
case CT_AGINO:
case CT_AGNUMBER:
@@ -495,6 +529,12 @@
case CT_RTX:
val->rtx = (xfs_rtblock_t)v;
break;
+ case CT_RBMBLOCK:
+ val->rbmblock = (xfs_fileoff_t)v;
+ break;
+ case CT_RBMWORD:
+ val->rbmword = (unsigned int)v;
+ break;
case CT_NONE:
case NCTS:
/* NOTREACHED */
diff --git a/man/man8/xfs_db.8 b/man/man8/xfs_db.8
index 0bf4342..12fc4f3 100644
--- a/man/man8/xfs_db.8
+++ b/man/man8/xfs_db.8
@@ -1173,6 +1173,16 @@
or
.B rtextent
(realtime extent)
+.HP
+.B rbmblock
+or
+.B rbmb
+(realtime bitmap block)
+.HP
+.B rbmword
+or
+.B rbmw
+(32-bit word within a realtime bitmap block)
.PD
.RE
.IP
