aboutsummaryrefslogtreecommitdiff
path: root/fs/f2fs/super.c
diff options
context:
space:
mode:
authorGravatar Eric Biggers <ebiggers@google.com> 2020-09-16 21:11:36 -0700
committerGravatar Eric Biggers <ebiggers@google.com> 2020-09-22 06:48:52 -0700
commitc8c868abc91ff23f6f5c4444c419de7c277d77e1 (patch)
tree93dd9591ebdf07595aec0c346ea222e91280d4ba /fs/f2fs/super.c
parentfscrypt: handle test_dummy_encryption in more logical way (diff)
downloadlinux-c8c868abc91ff23f6f5c4444c419de7c277d77e1.tar.gz
linux-c8c868abc91ff23f6f5c4444c419de7c277d77e1.tar.bz2
linux-c8c868abc91ff23f6f5c4444c419de7c277d77e1.zip
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 'fs/f2fs/super.c')
-rw-r--r--fs/f2fs/super.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index f05ee33f5f26..bef2be3fa3d0 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -438,7 +438,7 @@ static int f2fs_set_test_dummy_encryption(struct super_block *sb,
return -EINVAL;
}
err = fscrypt_set_test_dummy_encryption(
- sb, arg, &F2FS_OPTION(sbi).dummy_enc_policy);
+ sb, arg->from, &F2FS_OPTION(sbi).dummy_enc_policy);
if (err) {
if (err == -EEXIST)
f2fs_warn(sbi,