diff options
| author | Eric Biggers <ebiggers@google.com> | 2023-02-07 22:21:04 -0800 |
|---|---|---|
| committer | Eric Biggers <ebiggers@google.com> | 2023-02-07 22:30:30 -0800 |
| commit | 7959eb19e4a369639ff9e55eb1147360d5ac8ddb (patch) | |
| tree | 4ef12bfeae6659149d156354bce33537f2873c1d /fs/ext4 | |
| parent | 60e463f0be9874692a56a7d419a6e39029b6290d (diff) | |
| download | linux-stable-7959eb19e4a369639ff9e55eb1147360d5ac8ddb.tar.gz linux-stable-7959eb19e4a369639ff9e55eb1147360d5ac8ddb.tar.bz2 linux-stable-7959eb19e4a369639ff9e55eb1147360d5ac8ddb.zip | |
ext4: stop calling fscrypt_add_test_dummy_key()
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 <ebiggers@google.com>
Link: https://lore.kernel.org/r/20230208062107.199831-3-ebiggers@kernel.org
Diffstat (limited to 'fs/ext4')
| -rw-r--r-- | fs/ext4/super.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 260c1b3e3ef2..260bbab25db3 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -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; @@ -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, |