From: Eric Biggers Date: Tue, 12 May 2020 23:32:51 +0000 (-0700) Subject: fscrypt: make test_dummy_encryption use v2 by default X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=0ca2ddb0cd3c587ca50a29af7969bbfecbc3d663;p=linux.git fscrypt: make test_dummy_encryption use v2 by default Since v1 encryption policies are deprecated, make test_dummy_encryption test v2 policies by default. Note that this causes ext4/023 and ext4/028 to start failing due to known bugs in those tests (see previous commit). Link: https://lore.kernel.org/r/20200512233251.118314-5-ebiggers@kernel.org Reviewed-by: Jaegeuk Kim Reviewed-by: Theodore Ts'o Signed-off-by: Eric Biggers --- diff --git a/fs/crypto/policy.c b/fs/crypto/policy.c index bcab94b29d101..a15aec8e068ca 100644 --- a/fs/crypto/policy.c +++ b/fs/crypto/policy.c @@ -643,7 +643,7 @@ int fscrypt_set_test_dummy_encryption(struct super_block *sb, const substring_t *arg, struct fscrypt_dummy_context *dummy_ctx) { - const char *argstr = "v1"; + const char *argstr = "v2"; const char *argstr_to_free = NULL; struct fscrypt_key_specifier key_spec = { 0 }; int version;