misc: use m_blockwsize instead of sb_blocksize for rt blocks
In preparation to add block headers to rt bitmap and summary blocks,
convert all the relevant calculations in the userspace tools to use the
per-block word count instead of the raw blocksize. This is key to
adding this support outside of libxfs.
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
diff --git a/db/check.c b/db/check.c
index 619691e..1905650 100644
--- a/db/check.c
+++ b/db/check.c
@@ -3647,7 +3647,7 @@
int t;
xfs_rtword_t *words;
- bitsperblock = mp->m_sb.sb_blocksize * NBBY;
+ bitsperblock = mp->m_blockwsize << XFS_NBWORDLOG;
words = malloc(mp->m_blockwsize << XFS_WORDLOG);
if (!words) {
dbprintf(_("could not allocate rtwords buffer\n"));
@@ -3766,7 +3766,7 @@
args.sumbp = iocur_top->bp;
ondisk = xfs_rsumblock_infoptr(&args, 0);
- memcpy(sfile, ondisk, mp->m_sb.sb_blocksize);
+ memcpy(sfile, ondisk, mp->m_blockwsize << XFS_WORDLOG);
pop_cur();
sfile += mp->m_blockwsize;
}
diff --git a/repair/phase6.c b/repair/phase6.c
index 573b89d..a99793b 100644
--- a/repair/phase6.c
+++ b/repair/phase6.c
@@ -871,7 +871,7 @@
args.rbmbp = bp;
ondisk = xfs_rbmblock_wordptr(&args, 0);
- memcpy(ondisk, bmp, mp->m_sb.sb_blocksize);
+ memcpy(ondisk, bmp, mp->m_blockwsize << XFS_WORDLOG);
libxfs_trans_log_buf(tp, bp, 0, mp->m_sb.sb_blocksize - 1);
@@ -950,7 +950,7 @@
args.sumbp = bp;
ondisk = xfs_rsumblock_infoptr(&args, 0);
- memcpy(ondisk, smp, mp->m_sb.sb_blocksize);
+ memcpy(ondisk, smp, mp->m_blockwsize << XFS_WORDLOG);
libxfs_trans_log_buf(tp, bp, 0, mp->m_sb.sb_blocksize - 1);
diff --git a/repair/rt.c b/repair/rt.c
index 9aff5a0..e494878 100644
--- a/repair/rt.c
+++ b/repair/rt.c
@@ -25,8 +25,9 @@
return;
/*
- * realtime init -- blockmap initialization is
- * handled by incore_init()
+ * Allocate buffers for formatting the collected rt free space
+ * information. The rtbitmap buffer must be large enough to compare
+ * against any unused bytes in the last block of the file.
*/
wordcnt = libxfs_rtbitmap_wordcount(mp, mp->m_sb.sb_rextents);
btmcompute = calloc(wordcnt, sizeof(union xfs_rtword_raw));
@@ -87,7 +88,7 @@
ASSERT(mp->m_rbmip == NULL);
- bitsperblock = mp->m_sb.sb_blocksize * NBBY;
+ bitsperblock = mp->m_blockwsize << XFS_NBWORDLOG;
extno = start_ext = 0;
bmbno = in_extent = start_bmbno = 0;
@@ -199,7 +200,7 @@
break;
}
- if (memcmp(bp->b_addr, buf, mp->m_sb.sb_blocksize))
+ if (memcmp(bp->b_addr, buf, mp->m_blockwsize << XFS_WORDLOG))
do_warn(_("discrepancy in %s at dblock 0x%llx\n"),
filename, (unsigned long long)bno);
