Commit a5336d6b authored Dec 07, 2020 by Darrick J. Wong

xfs: fix the forward progress assertion in xfs_iwalk_run_callbacks

In commit 27c14b5d we started tracking the last inode seen during an
inode walk to avoid infinite loops if a corrupt inobt record happens to
have a lower ir_startino than the record preceeding it. Unfortunately,
the assertion trips over the case where there are completely empty inobt
records (which can happen quite easily on 64k page filesystems) because
we advance the tracking cursor without actually putting the empty record
into the processing buffer. Fix the assert to allow for this case.

Reported-by: <zlang@redhat.com>
Fixes: 27c14b5d ("xfs: ensure inobt record walks always make forward progress")
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Zorro Lang <zlang@redhat.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>

parent 2e984bad

fs/xfs/xfs_iwalk.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -363,7 +363,7 @@ xfs_iwalk_run_callbacks(
		/* Delete cursor but remember the last record we cached... */
		xfs_iwalk_del_inobt(tp, curpp, agi_bpp, 0);
		irec = &iwag->recs[iwag->nr_recs - 1];
		ASSERT(next_agino == irec->ir_startino + XFS_INODES_PER_CHUNK);
		ASSERT(next_agino >= irec->ir_startino + XFS_INODES_PER_CHUNK);

		error = xfs_iwalk_ag_recs(iwag);
		if (error)

Admin message