Commit 629dcb38 authored May 06, 2020 by Brian Foster Committed by Darrick J. Wong May 07, 2020

xfs: fix duplicate verification from xfs_qm_dqflush()



The pre-flush dquot verification in xfs_qm_dqflush() duplicates the
read verifier by checking the dquot in the on-disk buffer. Instead,
verify the in-core variant before it is flushed to the buffer.

Fixes: 7224fa48 ("xfs: add full xfs_dqblk verifier")
Signed-off-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Allison Collins <allison.henderson@oracle.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>

parent 61948b6f

fs/xfs/xfs_dquot.c

+4 −5

Original line number	Diff line number	Diff line
		@@ -1116,13 +1116,12 @@ xfs_qm_dqflush(
		dqb = bp->b_addr + dqp->q_bufoffset;
		ddqp = &dqb->dd_diskdq;

		/*
		* A simple sanity check in case we got a corrupted dquot.
		*/
		fa = xfs_dqblk_verify(mp, dqb, be32_to_cpu(ddqp->d_id), 0);
		/* sanity check the in-core structure before we flush */
		fa = xfs_dquot_verify(mp, &dqp->q_core, be32_to_cpu(dqp->q_core.d_id),
		0);
		if (fa) {
		xfs_alert(mp, "corrupt dquot ID 0x%x in memory at %pS",
		be32_to_cpu(ddqp->d_id), fa);
		be32_to_cpu(dqp->q_core.d_id), fa);
		xfs_buf_relse(bp);
		xfs_dqfunlock(dqp);
		xfs_force_shutdown(mp, SHUTDOWN_CORRUPT_INCORE);