On Wed, Apr 29, 2020 at 01:21:44PM -0400, Brian Foster wrote:
> 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.
>
> Signed-off-by: Brian Foster <bfoster@xxxxxxxxxx>
> Reviewed-by: Dave Chinner <dchinner@xxxxxxxxxx>
> Reviewed-by: Christoph Hellwig <hch@xxxxxx>
Fixes: 7224fa482a6d ("xfs: add full xfs_dqblk verifier") ?
Otherwise this looks ok,
Reviewed-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
--D
> ---
> fs/xfs/xfs_dquot.c | 9 ++++-----
> 1 file changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/fs/xfs/xfs_dquot.c b/fs/xfs/xfs_dquot.c
> index af2c8e5ceea0..265feb62290d 100644
> --- a/fs/xfs/xfs_dquot.c
> +++ b/fs/xfs/xfs_dquot.c
> @@ -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);
> --
> 2.21.1
>
