xfs: inode btree scrubber should calculate im_boffset correctly
authorDarrick J. Wong <darrick.wong@oracle.com>
Mon, 3 Jun 2019 16:18:26 +0000 (09:18 -0700)
committerDarrick J. Wong <darrick.wong@oracle.com>
Mon, 3 Jun 2019 16:18:40 +0000 (09:18 -0700)
The im_boffset field is in units of bytes, whereas XFS_INO_OFFSET
returns a value in units of inodes.  Convert the units so that scrub on
a 64k-block filesystem works correctly.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
fs/xfs/scrub/ialloc.c

index 693eb51f5efb2c7ebf38c977c5d76b738f42345a..9b47117180cb1e8baaa4c1ae85a72bfc285ec383 100644 (file)
@@ -252,7 +252,8 @@ xchk_iallocbt_check_cluster(
        ir_holemask = (irec->ir_holemask & cluster_mask);
        imap.im_blkno = XFS_AGB_TO_DADDR(mp, agno, agbno);
        imap.im_len = XFS_FSB_TO_BB(mp, mp->m_blocks_per_cluster);
-       imap.im_boffset = XFS_INO_TO_OFFSET(mp, irec->ir_startino);
+       imap.im_boffset = XFS_INO_TO_OFFSET(mp, irec->ir_startino) <<
+                       mp->m_sb.sb_inodelog;
 
        if (imap.im_boffset != 0 && cluster_base != 0) {
                ASSERT(imap.im_boffset == 0 || cluster_base == 0);