From: Eric Biggers <ebiggers@kernel.org>
To: dm-devel@lists.linux.dev, Alasdair Kergon <agk@redhat.com>,
Mike Snitzer <snitzer@kernel.org>,
Mikulas Patocka <mpatocka@redhat.com>,
Benjamin Marzinski <bmarzins@redhat.com>
Cc: Sami Tolvanen <samitolvanen@google.com>,
Eran Messeri <eranm@google.com>,
linux-kernel@vger.kernel.org, Eric Biggers <ebiggers@kernel.org>
Subject: [PATCH 4/7] dm-verity: remove unnecessary ifdef around verity_fec_decode()
Date: Tue, 16 Dec 2025 15:06:11 -0800 [thread overview]
Message-ID: <20251216230614.51779-5-ebiggers@kernel.org> (raw)
In-Reply-To: <20251216230614.51779-1-ebiggers@kernel.org>
Since verity_fec_decode() has a !CONFIG_DM_VERITY_FEC stub, it can just
be called unconditionally, similar to the other calls in the same file.
Signed-off-by: Eric Biggers <ebiggers@kernel.org>
---
drivers/md/dm-verity-target.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/md/dm-verity-target.c b/drivers/md/dm-verity-target.c
index c9f5602a42c6..777a0ebe8536 100644
--- a/drivers/md/dm-verity-target.c
+++ b/drivers/md/dm-verity-target.c
@@ -433,15 +433,13 @@ static int verity_handle_data_hash_mismatch(struct dm_verity *v,
if (verity_recheck(v, io, want_digest, blkno, data) == 0) {
if (v->validated_blocks)
set_bit(blkno, v->validated_blocks);
return 0;
}
-#if defined(CONFIG_DM_VERITY_FEC)
if (verity_fec_decode(v, io, DM_VERITY_BLOCK_TYPE_DATA, want_digest,
blkno, data) == 0)
return 0;
-#endif
if (bio->bi_status)
return -EIO; /* Error correction failed; Just return error */
if (verity_handle_err(v, DM_VERITY_BLOCK_TYPE_DATA, blkno)) {
io->had_mismatch = true;
--
2.52.0
next prev parent reply other threads:[~2025-12-16 23:07 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-12-16 23:06 [PATCH 0/7] dm-verity: FEC optimizations and fixes Eric Biggers
2025-12-16 23:06 ` [PATCH 1/7] dm-verity: move dm_verity_fec_io to mempool Eric Biggers
2025-12-17 17:41 ` Sami Tolvanen
2025-12-16 23:06 ` [PATCH 2/7] dm-verity: make dm_verity_fec_io::bufs variable-length Eric Biggers
2025-12-17 17:45 ` Sami Tolvanen
2025-12-16 23:06 ` [PATCH 3/7] dm-verity: remove unnecessary condition for verity_fec_finish_io() Eric Biggers
2025-12-17 17:46 ` Sami Tolvanen
2025-12-16 23:06 ` Eric Biggers [this message]
2025-12-17 17:47 ` [PATCH 4/7] dm-verity: remove unnecessary ifdef around verity_fec_decode() Sami Tolvanen
2025-12-16 23:06 ` [PATCH 5/7] dm-verity: make verity_fec_is_enabled() an inline function Eric Biggers
2025-12-17 17:48 ` Sami Tolvanen
2025-12-16 23:06 ` [PATCH 6/7] dm-verity: correctly handle dm_bufio_client_create() failure Eric Biggers
2025-12-17 17:50 ` Sami Tolvanen
2025-12-16 23:06 ` [PATCH 7/7] dm-verity: allow REED_SOLOMON to be 'm' if DM_VERITY is 'm' Eric Biggers
2025-12-17 17:51 ` Sami Tolvanen
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=20251216230614.51779-5-ebiggers@kernel.org \
--to=ebiggers@kernel.org \
--cc=agk@redhat.com \
--cc=bmarzins@redhat.com \
--cc=dm-devel@lists.linux.dev \
--cc=eranm@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mpatocka@redhat.com \
--cc=samitolvanen@google.com \
--cc=snitzer@kernel.org \
/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