diff options
| author | Darrick J. Wong <darrick.wong@oracle.com> | 2017-08-18 12:00:03 -0500 |
|---|---|---|
| committer | Eric Sandeen <sandeen@redhat.com> | 2017-08-18 12:00:03 -0500 |
| commit | ef209a960d822d4f06109eee4262a5bce34c3403 (patch) | |
| tree | 7ba6edd6bf28e1464a1093eaf77aa7c77bc7d0cc | |
| parent | 6a07c22c2486ebe6808f45cbe6aef3d0dfbce2cf (diff) | |
| download | xfsprogs-dev-ef209a960d822d4f06109eee4262a5bce34c3403.tar.gz | |
xfs_db: make write/fuzz -c and -d work on non-crc filesystems
For a non-crc filesystem, make write/fuzz -c and -d work properly
instead of bailing out. Since there's no checksum to update, both
cases collapse to setting the field value without calling the write
verifier.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
| -rw-r--r-- | db/fuzz.c | 8 | ||||
| -rw-r--r-- | db/write.c | 7 |
2 files changed, 11 insertions, 4 deletions
@@ -125,7 +125,9 @@ fuzz_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 && + xfs_sb_version_hascrc(&mp->m_sb)) { dbprintf(_("Cannot recalculate CRCs on this type of object\n")); return 0; } @@ -149,7 +151,9 @@ fuzz_f( local_ops.verify_read = stashed_ops->verify_read; iocur_top->bp->b_ops = &local_ops; - if (corrupt) { + if (!xfs_sb_version_hascrc(&mp->m_sb)) { + local_ops.verify_write = xfs_dummy_verify; + } else if (corrupt) { local_ops.verify_write = xfs_dummy_verify; dbprintf(_("Allowing fuzz of corrupted data and bad CRC\n")); } else if (iocur_top->typ->crc_off == TYP_F_CRC_FUNC) { diff --git a/db/write.c b/db/write.c index 9fc6d8eea5..5ef76bcd23 100644 --- a/db/write.c +++ b/db/write.c @@ -138,7 +138,8 @@ write_f( } if (invalid_data && - iocur_top->typ->crc_off == TYP_F_NO_CRC_OFF) { + iocur_top->typ->crc_off == TYP_F_NO_CRC_OFF && + xfs_sb_version_hascrc(&mp->m_sb)) { dbprintf(_("Cannot recalculate CRCs on this type of object\n")); return 0; } @@ -162,7 +163,9 @@ write_f( local_ops.verify_read = stashed_ops->verify_read; iocur_top->bp->b_ops = &local_ops; - if (corrupt) { + if (!xfs_sb_version_hascrc(&mp->m_sb)) { + local_ops.verify_write = xfs_dummy_verify; + } else if (corrupt) { local_ops.verify_write = xfs_dummy_verify; dbprintf(_("Allowing write of corrupted data and bad CRC\n")); } else if (iocur_top->typ->crc_off == TYP_F_CRC_FUNC) { |