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/enable.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/enable.c')
| -rw-r--r-- | fs/verity/enable.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/fs/verity/enable.c b/fs/verity/enable.c index a949ce817202..8a9189d47983 100644 --- a/fs/verity/enable.c +++ b/fs/verity/enable.c @@ -70,10 +70,6 @@ static int build_merkle_tree_level(struct file *filp, unsigned int level, for (i = 0; i < num_blocks_to_hash; i++) { struct page *src_page; - if ((pgoff_t)i % 10000 == 0 || i + 1 == num_blocks_to_hash) - pr_debug("Hashing block %llu of %llu for level %u\n", - i + 1, num_blocks_to_hash, level); - if (level == 0) { /* Leaf: hashing a data block */ src_page = read_file_data_page(filp, i, &ra, @@ -263,15 +259,12 @@ static int enable_verity(struct file *filp, * ->begin_enable_verity() and ->end_enable_verity() using the inode * lock and only allow one process to be here at a time on a given file. */ - pr_debug("Building Merkle tree...\n"); BUILD_BUG_ON(sizeof(desc->root_hash) < FS_VERITY_MAX_DIGEST_SIZE); err = build_merkle_tree(filp, ¶ms, desc->root_hash); if (err) { fsverity_err(inode, "Error %d building Merkle tree", err); goto rollback; } - pr_debug("Done building Merkle tree. Root hash is %s:%*phN\n", - params.hash_alg->name, params.digest_size, desc->root_hash); /* * Create the fsverity_info. Don't bother trying to save work by @@ -286,10 +279,6 @@ static int enable_verity(struct file *filp, goto rollback; } - if (arg->sig_size) - pr_debug("Storing a %u-byte PKCS#7 signature alongside the file\n", - arg->sig_size); - /* * Tell the filesystem to finish enabling verity on the file. * Serialized with ->begin_enable_verity() by the inode lock. |