diff options
| author | Eric Biggers <ebiggers@google.com> | 2020-09-16 21:11:36 -0700 |
|---|---|---|
| committer | Eric Biggers <ebiggers@google.com> | 2020-09-22 06:48:52 -0700 |
| commit | c8c868abc91ff23f6f5c4444c419de7c277d77e1 (patch) | |
| tree | 93dd9591ebdf07595aec0c346ea222e91280d4ba /include/linux/fscrypt.h | |
| parent | ac4acb1f4b2b6b7e8d913537cccec8789903e164 (diff) | |
fscrypt: make fscrypt_set_test_dummy_encryption() take a 'const char *'
fscrypt_set_test_dummy_encryption() requires that the optional argument
to the test_dummy_encryption mount option be specified as a substring_t.
That doesn't work well with filesystems that use the new mount API,
since the new way of parsing mount options doesn't use substring_t.
Make it take the argument as a 'const char *' instead.
Instead of moving the match_strdup() into the callers in ext4 and f2fs,
make them just use arg->from directly. Since the pattern is
"test_dummy_encryption=%s", the argument will be null-terminated.
Acked-by: Jeff Layton <jlayton@kernel.org>
Link: https://lore.kernel.org/r/20200917041136.178600-14-ebiggers@kernel.org
Signed-off-by: Eric Biggers <ebiggers@google.com>
Diffstat (limited to 'include/linux/fscrypt.h')
| -rw-r--r-- | include/linux/fscrypt.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/include/linux/fscrypt.h b/include/linux/fscrypt.h index b3b0c5675c6b..fc67c4cbaa96 100644 --- a/include/linux/fscrypt.h +++ b/include/linux/fscrypt.h @@ -15,7 +15,6 @@ #include <linux/fs.h> #include <linux/mm.h> -#include <linux/parser.h> #include <linux/slab.h> #include <uapi/linux/fscrypt.h> @@ -153,9 +152,7 @@ struct fscrypt_dummy_policy { const union fscrypt_policy *policy; }; -int fscrypt_set_test_dummy_encryption( - struct super_block *sb, - const substring_t *arg, +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); |