From aa13f87a2cb6c0a4799fae78f0cff8d386bb6f9c Mon Sep 17 00:00:00 2001 From: Eric Sandeen Date: Tue, 2 May 2017 11:12:50 -0500 Subject: [PATCH] xfs_db: allow write -d to dqblks Allow write -d to write bad data and recalculate CRC for dqblks. Inspired-by: Darrick J. Wong Signed-off-by: Eric Sandeen Reviewed-by: Darrick J. Wong Signed-off-by: Eric Sandeen --- db/io.c | 11 +++++++++++ db/io.h | 1 + db/write.c | 6 +++++- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/db/io.c b/db/io.c index 67ed5f9e0..9918a51d0 100644 --- a/db/io.c +++ b/db/io.c @@ -475,6 +475,17 @@ xfs_verify_recalc_inode_crc( iocur_top->ino_crc_ok = 1; } +void +xfs_verify_recalc_dquot_crc( + struct xfs_buf *bp) +{ + ASSERT((iocur_top->dquot_buf)); + ASSERT(iocur_top->bp == bp); + + xfs_update_cksum(iocur_top->data, sizeof(struct xfs_dqblk), + XFS_DQUOT_CRC_OFF); +} + void xfs_verify_recalc_crc( struct xfs_buf *bp) diff --git a/db/io.h b/db/io.h index 12d96c2a5..b415b82d1 100644 --- a/db/io.h +++ b/db/io.h @@ -65,6 +65,7 @@ extern void ring_add(void); extern void set_iocur_type(const struct typ *t); extern void xfs_dummy_verify(struct xfs_buf *bp); extern void xfs_verify_recalc_inode_crc(struct xfs_buf *bp); +extern void xfs_verify_recalc_dquot_crc(struct xfs_buf *bp); extern void xfs_verify_recalc_crc(struct xfs_buf *bp); /* diff --git a/db/write.c b/db/write.c index 70c986561..d24ea0594 100644 --- a/db/write.c +++ b/db/write.c @@ -139,7 +139,8 @@ write_f( if (invalid_data && iocur_top->typ->crc_off == TYP_F_NO_CRC_OFF && - !iocur_top->ino_buf) { + !iocur_top->ino_buf && + !iocur_top->dquot_buf) { dbprintf(_("Cannot recalculate CRCs on this type of object\n")); return 0; } @@ -169,6 +170,9 @@ write_f( } else if (iocur_top->ino_buf) { local_ops.verify_write = xfs_verify_recalc_inode_crc; dbprintf(_("Allowing write of corrupted inode with good CRC\n")); + } else if (iocur_top->dquot_buf) { + local_ops.verify_write = xfs_verify_recalc_dquot_crc; + dbprintf(_("Allowing write of corrupted dquot with good CRC\n")); } else { /* invalid data */ local_ops.verify_write = xfs_verify_recalc_crc; dbprintf(_("Allowing write of corrupted data with good CRC\n")); -- 2.50.1