From: Eric Biggers <ebiggers@kernel.org>
To: fstests@vger.kernel.org
Cc: linux-fscrypt@vger.kernel.org
Subject: [PATCH 06/10] generic/573: support non-4K Merkle tree block size
Date: Sat, 10 Dec 2022 23:06:59 -0800 [thread overview]
Message-ID: <20221211070704.341481-7-ebiggers@kernel.org> (raw)
In-Reply-To: <20221211070704.341481-1-ebiggers@kernel.org>
From: Eric Biggers <ebiggers@google.com>
Update generic/573 to not implicitly assume that the Merkle tree block
size being used is 4096 bytes.
Signed-off-by: Eric Biggers <ebiggers@google.com>
---
tests/generic/573 | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tests/generic/573 b/tests/generic/573
index 63c0aef5..ca0f27f9 100755
--- a/tests/generic/573
+++ b/tests/generic/573
@@ -36,23 +36,23 @@ fsv_file=$SCRATCH_MNT/file.fsv
_fsv_scratch_begin_subtest "FS_IOC_ENABLE_VERITY doesn't require root"
echo foo > $fsv_file
chmod 666 $fsv_file
-_user_do "$FSVERITY_PROG enable $fsv_file"
+_user_do "$FSVERITY_PROG enable --block-size=$FSV_BLOCK_SIZE $fsv_file"
_fsv_scratch_begin_subtest "FS_IOC_ENABLE_VERITY requires write access"
echo foo > $fsv_file >> $seqres.full
chmod 444 $fsv_file
-_user_do "$FSVERITY_PROG enable $fsv_file" |& _filter_scratch
+_user_do "$FSVERITY_PROG enable --block-size=$FSV_BLOCK_SIZE $fsv_file" |& _filter_scratch
_fsv_scratch_begin_subtest "FS_IOC_ENABLE_VERITY requires !append-only"
echo foo > $fsv_file >> $seqres.full
$CHATTR_PROG +a $fsv_file
-$FSVERITY_PROG enable $fsv_file |& _filter_scratch
+_fsv_enable $fsv_file |& _filter_scratch
$CHATTR_PROG -a $fsv_file
_fsv_scratch_begin_subtest "FS_IOC_ENABLE_VERITY requires !immutable"
echo foo > $fsv_file >> $seqres.full
$CHATTR_PROG +i $fsv_file
-$FSVERITY_PROG enable $fsv_file |& _filter_scratch
+_fsv_enable $fsv_file |& _filter_scratch
$CHATTR_PROG -i $fsv_file
_fsv_scratch_begin_subtest "FS_IOC_MEASURE_VERITY doesn't require root"
--
2.38.1
next prev parent reply other threads:[~2022-12-11 7:07 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-11 7:06 [PATCH 00/10] xfstests: update verity tests for non-4K block and page size Eric Biggers
2022-12-11 7:06 ` [PATCH 01/10] common/verity: add and use _fsv_can_enable() Eric Biggers
2022-12-11 7:06 ` [PATCH 02/10] common/verity: set FSV_BLOCK_SIZE to an appropriate value Eric Biggers
2022-12-11 7:06 ` [PATCH 03/10] common/verity: use FSV_BLOCK_SIZE by default Eric Biggers
2022-12-11 7:06 ` [PATCH 04/10] common/verity: add _filter_fsverity_digest() Eric Biggers
2022-12-11 7:06 ` [PATCH 05/10] generic/572: support non-4K Merkle tree block size Eric Biggers
2022-12-11 7:06 ` Eric Biggers [this message]
2022-12-11 7:07 ` [PATCH 07/10] generic/577: " Eric Biggers
2022-12-11 7:07 ` [PATCH 08/10] generic/574: test multiple Merkle tree block sizes Eric Biggers
2022-12-11 7:07 ` [PATCH 09/10] generic/624: " Eric Biggers
2022-12-20 6:56 ` Zorro Lang
2022-12-20 8:00 ` Eric Biggers
2022-12-20 20:40 ` Zorro Lang
2022-12-11 7:07 ` [PATCH 10/10] generic/575: test 1K Merkle tree block size Eric Biggers
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=20221211070704.341481-7-ebiggers@kernel.org \
--to=ebiggers@kernel.org \
--cc=fstests@vger.kernel.org \
--cc=linux-fscrypt@vger.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.