From: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
Teach scrub how to handle the case that there are one or more inobt
records covering a given inode cluster. This fixes the operation on big
block filesystems (e.g. 64k blocks, 512 byte inodes).
Signed-off-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
---
fs/xfs/scrub/ialloc.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/fs/xfs/scrub/ialloc.c b/fs/xfs/scrub/ialloc.c
index 10c3aaefc2a3..5a5f8ae31803 100644
--- a/fs/xfs/scrub/ialloc.c
+++ b/fs/xfs/scrub/ialloc.c
@@ -169,6 +169,7 @@ xchk_iallocbt_check_cluster_ifree(
xfs_ino_t fsino;
xfs_agino_t agino;
unsigned int offset;
+ unsigned int cluster_ioff;
bool irec_free;
bool ino_inuse;
bool freemask_ok;
@@ -181,11 +182,13 @@ xchk_iallocbt_check_cluster_ifree(
* Given an inobt record, an offset of a cluster within the record,
* and an offset of an inode within a cluster, compute which fs inode
* we're talking about and the offset of the inode record within the
- * inode buffer.
+ * inode buffer, being careful about inobt records that don't align
+ * with the start of the inode buffer when block sizes are large.
*/
agino = irec->ir_startino + chunk_ioff + loop_ioff;
fsino = XFS_AGINO_TO_INO(mp, bs->cur->bc_private.a.agno, agino);
- offset = loop_ioff * mp->m_sb.sb_inodesize;
+ cluster_ioff = XFS_INO_TO_OFFSET(mp, irec->ir_startino + chunk_ioff);
+ offset = (cluster_ioff + loop_ioff) * mp->m_sb.sb_inodesize;
if (offset >= BBTOB(bp->b_length)) {
xchk_btree_set_corrupt(bs->sc, bs->cur, 0);
goto out;
