diff options
| author | Eric Biggers <ebiggers@google.com> | 2022-08-15 11:45:01 -0700 |
|---|---|---|
| committer | Eric Biggers <ebiggers@google.com> | 2022-08-22 13:47:51 -0700 |
| commit | 272ac1500372183ffd54b0c9f43f52afc482e610 (patch) | |
| tree | 6652edf8d7b51183b35f3b1f2e65e2cf3c81623b | |
| parent | 1c23f9e627a7b412978b4e852793c5e3c3efc555 (diff) | |
| download | lwn-272ac1500372183ffd54b0c9f43f52afc482e610.tar.gz lwn-272ac1500372183ffd54b0c9f43f52afc482e610.zip | |
fscrypt: remove fscrypt_set_test_dummy_encryption()
Now that all its callers have been converted to
fscrypt_parse_test_dummy_encryption() and fscrypt_add_test_dummy_key()
instead, fscrypt_set_test_dummy_encryption() can be removed.
Signed-off-by: Eric Biggers <ebiggers@google.com>
Link: https://lore.kernel.org/r/20220513231605.175121-6-ebiggers@kernel.org
| -rw-r--r-- | fs/crypto/policy.c | 13 | ||||
| -rw-r--r-- | include/linux/fscrypt.h | 2 |
2 files changed, 0 insertions, 15 deletions
diff --git a/fs/crypto/policy.c b/fs/crypto/policy.c index 80b8ca0f340b..55d57181cd9e 100644 --- a/fs/crypto/policy.c +++ b/fs/crypto/policy.c @@ -833,19 +833,6 @@ bool fscrypt_dummy_policies_equal(const struct fscrypt_dummy_policy *p1, } EXPORT_SYMBOL_GPL(fscrypt_dummy_policies_equal); -/* Deprecated, do not use */ -int fscrypt_set_test_dummy_encryption(struct super_block *sb, const char *arg, - struct fscrypt_dummy_policy *dummy_policy) -{ - struct fs_parameter param = { - .type = fs_value_is_string, - .string = arg ? (char *)arg : "", - }; - return fscrypt_parse_test_dummy_encryption(¶m, dummy_policy) ?: - fscrypt_add_test_dummy_key(sb, dummy_policy); -} -EXPORT_SYMBOL_GPL(fscrypt_set_test_dummy_encryption); - /** * fscrypt_show_test_dummy_encryption() - show '-o test_dummy_encryption' * @seq: the seq_file to print the option to diff --git a/include/linux/fscrypt.h b/include/linux/fscrypt.h index 7d2f1e0f23b1..b95b8601b9c1 100644 --- a/include/linux/fscrypt.h +++ b/include/linux/fscrypt.h @@ -295,8 +295,6 @@ int fscrypt_parse_test_dummy_encryption(const struct fs_parameter *param, struct fscrypt_dummy_policy *dummy_policy); bool fscrypt_dummy_policies_equal(const struct fscrypt_dummy_policy *p1, const struct fscrypt_dummy_policy *p2); -int fscrypt_set_test_dummy_encryption(struct super_block *sb, const char *arg, - struct fscrypt_dummy_policy *dummy_policy); void fscrypt_show_test_dummy_encryption(struct seq_file *seq, char sep, struct super_block *sb); static inline bool |