From 6f7f89286ecd24fcc3b0e83dd71d24dbba756dd0 Mon Sep 17 00:00:00 2001 From: "Darrick J. Wong" Date: Tue, 2 May 2017 11:12:31 -0500 Subject: [PATCH] xfs_db: allow write -d to inodes Add a helper function to xfs_db so that we can recalculate the CRC of an inode whose field we just wrote. This enables us to write arbitrary values with a good CRC for the purpose of checking the read verifiers on a v5 filesystem. Signed-off-by: Darrick J. Wong Reviewed-by: Eric Sandeen Signed-off-by: Eric Sandeen --- db/io.c | 11 +++++++++++ db/io.h | 1 + db/write.c | 7 ++++++- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/db/io.c b/db/io.c index f39819581..67ed5f9e0 100644 --- a/db/io.c +++ b/db/io.c @@ -464,6 +464,17 @@ xfs_dummy_verify( return; } +void +xfs_verify_recalc_inode_crc( + struct xfs_buf *bp) +{ + ASSERT(iocur_top->ino_buf); + ASSERT(iocur_top->bp == bp); + + libxfs_dinode_calc_crc(mp, iocur_top->data); + iocur_top->ino_crc_ok = 1; +} + void xfs_verify_recalc_crc( struct xfs_buf *bp) diff --git a/db/io.h b/db/io.h index c69e9ce9e..12d96c2a5 100644 --- a/db/io.h +++ b/db/io.h @@ -64,6 +64,7 @@ extern void set_cur(const struct typ *t, __int64_t d, int c, int ring_add, 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_crc(struct xfs_buf *bp); /* diff --git a/db/write.c b/db/write.c index 5c83874f1..70c986561 100644 --- a/db/write.c +++ b/db/write.c @@ -137,7 +137,9 @@ write_f( return 0; } - if (invalid_data && iocur_top->typ->crc_off == TYP_F_NO_CRC_OFF) { + if (invalid_data && + iocur_top->typ->crc_off == TYP_F_NO_CRC_OFF && + !iocur_top->ino_buf) { dbprintf(_("Cannot recalculate CRCs on this type of object\n")); return 0; } @@ -164,6 +166,9 @@ write_f( if (corrupt) { local_ops.verify_write = xfs_dummy_verify; dbprintf(_("Allowing write of corrupted data and bad CRC\n")); + } 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 { /* invalid data */ local_ops.verify_write = xfs_verify_recalc_crc; dbprintf(_("Allowing write of corrupted data with good CRC\n")); -- 2.47.2