From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: Eric Sandeen <sandeen@redhat.com>
Cc: xfs <linux-xfs@vger.kernel.org>, eguan@redhat.com
Subject: [PATCH] xfs_db: make write/fuzz -c and -d work on non-crc filesystems
Date: Thu, 17 Aug 2017 09:53:31 -0700 [thread overview]
Message-ID: <20170817165331.GF4796@magnolia> (raw)
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>
---
db/fuzz.c | 8 ++++++--
db/write.c | 7 +++++--
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/db/fuzz.c b/db/fuzz.c
index 76dbf94..53cedbc 100644
--- a/db/fuzz.c
+++ b/db/fuzz.c
@@ -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 9fc6d8e..5ef76bc 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) {
next reply other threads:[~2017-08-17 16:53 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-17 16:53 Darrick J. Wong [this message]
2017-08-17 21:31 ` [PATCH] xfs_db: make write/fuzz -c and -d work on non-crc filesystems Eric Sandeen
2017-08-18 8:59 ` Carlos Maiolino
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170817165331.GF4796@magnolia \
--to=darrick.wong@oracle.com \
--cc=eguan@redhat.com \
--cc=linux-xfs@vger.kernel.org \
--cc=sandeen@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox