diff options
| author | Eric Biggers <ebiggers@google.com> | 2022-12-15 09:04:20 +0300 |
|---|---|---|
| committer | Eric Biggers <ebiggers@google.com> | 2023-01-02 02:46:48 +0300 |
| commit | 86f66569baca98478b7ff2f49c8ee54cf3b108cd (patch) | |
| tree | 7858d26683cec9b4917e44ac34b329ee3fda8fb2 /fs/verity/verify.c | |
| parent | 72ea15f0ddd29b9facdab836a2f5d3e28df9b202 (diff) | |
| download | linux-86f66569baca98478b7ff2f49c8ee54cf3b108cd.tar.xz | |
fsverity: remove debug messages and CONFIG_FS_VERITY_DEBUG
I've gotten very little use out of these debug messages, and I'm not
aware of anyone else having used them.
Indeed, sprinkling pr_debug around is not really a best practice these
days, especially for filesystem code. Tracepoints are used instead.
Let's just remove these and start from a clean slate.
This change does not affect info, warning, and error messages.
Signed-off-by: Eric Biggers <ebiggers@google.com>
Link: https://lore.kernel.org/r/20221215060420.60692-1-ebiggers@kernel.org
Diffstat (limited to 'fs/verity/verify.c')
| -rw-r--r-- | fs/verity/verify.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/fs/verity/verify.c b/fs/verity/verify.c index 961ba248021f..de0d7aef785b 100644 --- a/fs/verity/verify.c +++ b/fs/verity/verify.c @@ -9,7 +9,6 @@ #include <crypto/hash.h> #include <linux/bio.h> -#include <linux/ratelimit.h> static struct workqueue_struct *fsverity_read_workqueue; @@ -91,8 +90,6 @@ static bool verify_page(struct inode *inode, const struct fsverity_info *vi, if (WARN_ON_ONCE(!PageLocked(data_page) || PageUptodate(data_page))) return false; - pr_debug_ratelimited("Verifying data page %lu...\n", index); - /* * Starting at the leaf level, ascend the tree saving hash pages along * the way until we find a verified hash page, indicated by PageChecked; @@ -105,9 +102,6 @@ static bool verify_page(struct inode *inode, const struct fsverity_info *vi, hash_at_level(params, index, level, &hindex, &hoffset); - pr_debug_ratelimited("Level %d: hindex=%lu, hoffset=%u\n", - level, hindex, hoffset); - hpage = inode->i_sb->s_vop->read_merkle_tree_page(inode, hindex, level == 0 ? level0_ra_pages : 0); if (IS_ERR(hpage)) { @@ -122,19 +116,13 @@ static bool verify_page(struct inode *inode, const struct fsverity_info *vi, memcpy_from_page(_want_hash, hpage, hoffset, hsize); want_hash = _want_hash; put_page(hpage); - pr_debug_ratelimited("Hash page already checked, want %s:%*phN\n", - params->hash_alg->name, - hsize, want_hash); goto descend; } - pr_debug_ratelimited("Hash page not yet checked\n"); hpages[level] = hpage; hoffsets[level] = hoffset; } want_hash = vi->root_hash; - pr_debug("Want root hash: %s:%*phN\n", - params->hash_alg->name, hsize, want_hash); descend: /* Descend the tree verifying hash pages */ for (; level > 0; level--) { @@ -151,8 +139,6 @@ descend: memcpy_from_page(_want_hash, hpage, hoffset, hsize); want_hash = _want_hash; put_page(hpage); - pr_debug("Verified hash page at level %d, now want %s:%*phN\n", - level - 1, params->hash_alg->name, hsize, want_hash); } /* Finally, verify the data page */ |