Skip to content

Commit

Permalink
ext4: stop calling fscrypt_add_test_dummy_key()
Browse files Browse the repository at this point in the history
Now that fs/crypto/ adds the test dummy encryption key on-demand when
it's needed, there's no need for individual filesystems to call
fscrypt_add_test_dummy_key().  Remove the call to it from ext4.

Signed-off-by: Eric Biggers <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
  • Loading branch information
ebiggers committed Feb 8, 2023
1 parent 60e463f commit 7959eb1
Showing 1 changed file with 1 addition and 12 deletions.
13 changes: 1 addition & 12 deletions fs/ext4/super.c
Original file line number Diff line number Diff line change
Expand Up @@ -2635,7 +2635,6 @@ static int ext4_check_test_dummy_encryption(const struct fs_context *fc,
{
const struct ext4_fs_context *ctx = fc->fs_private;
const struct ext4_sb_info *sbi = EXT4_SB(sb);
int err;

if (!fscrypt_is_dummy_policy_set(&ctx->dummy_enc_policy))
return 0;
Expand Down Expand Up @@ -2668,17 +2667,7 @@ static int ext4_check_test_dummy_encryption(const struct fs_context *fc,
"Conflicting test_dummy_encryption options");
return -EINVAL;
}
/*
* fscrypt_add_test_dummy_key() technically changes the super_block, so
* technically it should be delayed until ext4_apply_options() like the
* other changes. But since we never get here for remounts (see above),
* and this is the last chance to report errors, we do it here.
*/
err = fscrypt_add_test_dummy_key(sb, &ctx->dummy_enc_policy);
if (err)
ext4_msg(NULL, KERN_WARNING,
"Error adding test dummy encryption key [%d]", err);
return err;
return 0;
}

static void ext4_apply_test_dummy_encryption(struct ext4_fs_context *ctx,
Expand Down

0 comments on commit 7959eb1

Please sign in to comment.