summaryrefslogtreecommitdiff
path: root/fs/xfs/scrub
diff options
context:
space:
mode:
authorDarrick J. Wong <darrick.wong@oracle.com>2019-02-01 20:08:52 +0300
committerDarrick J. Wong <darrick.wong@oracle.com>2019-02-12 03:06:39 +0300
commitf9e63342b858332d932414a7b27cad1d5557c84c (patch)
treed98ef6dd8e8e7c1addc0f34d55e9d90378460acb /fs/xfs/scrub
parent4539b8a7807848ad5c9e4d1d4199f34eb88669c5 (diff)
downloadlinux-f9e63342b858332d932414a7b27cad1d5557c84c.tar.xz
xfs: consolidate scrub dinode mapping code into a single function
Move all the confusing dinode mapping code that's split between xchk_iallocbt_check_cluster and xchk_iallocbt_check_cluster_ifree into the first function so that it's clearer how we find the dinode for a given inode. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Reviewed-by: Brian Foster <bfoster@redhat.com>
Diffstat (limited to 'fs/xfs/scrub')
-rw-r--r--fs/xfs/scrub/ialloc.c62
1 files changed, 32 insertions, 30 deletions
diff --git a/fs/xfs/scrub/ialloc.c b/fs/xfs/scrub/ialloc.c
index 1929d79ea6b3..2c9dad2b61b1 100644
--- a/fs/xfs/scrub/ialloc.c
+++ b/fs/xfs/scrub/ialloc.c
@@ -145,24 +145,19 @@ xchk_iallocbt_freecount(
* cluster buffer itself); and the index of the inode within the cluster.
*
* @irec is the inobt record.
- * @cluster_base is the inode offset of the cluster within the @irec.
- * @cluster_bp is the cluster buffer.
- * @cluster_index is the inode offset within the inode cluster.
+ * @irec_ino is the inode offset from the start of the record.
+ * @dip is the on-disk inode.
*/
STATIC int
xchk_iallocbt_check_cluster_ifree(
struct xchk_btree *bs,
struct xfs_inobt_rec_incore *irec,
- unsigned int cluster_base,
- struct xfs_buf *cluster_bp,
- unsigned int cluster_index)
+ unsigned int irec_ino,
+ struct xfs_dinode *dip)
{
struct xfs_mount *mp = bs->cur->bc_mp;
- struct xfs_dinode *dip;
xfs_ino_t fsino;
xfs_agino_t agino;
- unsigned int offset;
- unsigned int cluster_buf_base;
bool irec_free;
bool ino_inuse;
bool freemask_ok;
@@ -172,27 +167,12 @@ xchk_iallocbt_check_cluster_ifree(
return error;
/*
- * 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 that inode within the buffer.
- *
- * Be careful about inobt records that don't align with the start of
- * the inode buffer when block sizes are large enough to hold multiple
- * inode chunks. When this happens, cluster_base will be zero but
- * ir_startino can be large enough to make cluster_buf_base nonzero.
+ * Given an inobt record and the offset of an inode from the start of
+ * the record, compute which fs inode we're talking about.
*/
- agino = irec->ir_startino + cluster_base + cluster_index;
+ agino = irec->ir_startino + irec_ino;
fsino = XFS_AGINO_TO_INO(mp, bs->cur->bc_private.a.agno, agino);
- cluster_buf_base = XFS_INO_TO_OFFSET(mp, irec->ir_startino);
- ASSERT(cluster_buf_base == 0 || cluster_base == 0);
- offset = (cluster_buf_base + cluster_index) * mp->m_sb.sb_inodesize;
- if (offset >= BBTOB(cluster_bp->b_length)) {
- xchk_btree_set_corrupt(bs->sc, bs->cur, 0);
- goto out;
- }
- dip = xfs_buf_offset(cluster_bp, offset);
- irec_free = (irec->ir_free & XFS_INOBT_MASK(cluster_base +
- cluster_index));
+ irec_free = (irec->ir_free & XFS_INOBT_MASK(irec_ino));
if (be16_to_cpu(dip->di_magic) != XFS_DINODE_MAGIC ||
(dip->di_version >= 3 && be64_to_cpu(dip->di_ino) != fsino)) {
@@ -262,10 +242,23 @@ xchk_iallocbt_check_cluster(
cluster_mask |= XFS_INOBT_MASK((cluster_base + cluster_index) /
XFS_INODES_PER_HOLEMASK_BIT);
+ /*
+ * Map the first inode of this cluster to a buffer and offset.
+ * Be careful about inobt records that don't align with the start of
+ * the inode buffer when block sizes are large enough to hold multiple
+ * inode chunks. When this happens, cluster_base will be zero but
+ * ir_startino can be large enough to make im_boffset nonzero.
+ */
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 = 0;
+ imap.im_boffset = XFS_INO_TO_OFFSET(mp, irec->ir_startino);
+
+ if (imap.im_boffset != 0 && cluster_base != 0) {
+ ASSERT(imap.im_boffset == 0 || cluster_base == 0);
+ xchk_btree_set_corrupt(bs->sc, bs->cur, 0);
+ return 0;
+ }
trace_xchk_iallocbt_check_cluster(mp, agno, irec->ir_startino,
imap.im_blkno, imap.im_len, cluster_base, nr_inodes,
@@ -298,10 +291,19 @@ xchk_iallocbt_check_cluster(
/* Check free status of each inode within this cluster. */
for (cluster_index = 0; cluster_index < nr_inodes; cluster_index++) {
+ struct xfs_dinode *dip;
+
+ if (imap.im_boffset >= BBTOB(cluster_bp->b_length)) {
+ xchk_btree_set_corrupt(bs->sc, bs->cur, 0);
+ break;
+ }
+
+ dip = xfs_buf_offset(cluster_bp, imap.im_boffset);
error = xchk_iallocbt_check_cluster_ifree(bs, irec,
- cluster_base, cluster_bp, cluster_index);
+ cluster_base + cluster_index, dip);
if (error)
break;
+ imap.im_boffset += mp->m_sb.sb_inodesize;
}
xfs_trans_brelse(bs->cur->bc_tp, cluster_bp);