This series cleans up and fixes the way that ext4 and f2fs handle the test_dummy_encryption mount option. Some patches from v2 were already applied to the fscrypt and f2fs trees. This series just includes the remaining patches. Patches 1-2 can be applied to the ext4 tree now. The remaining patches will need to wait until their prerequisites get merged via the fscrypt tree. Changed from v2 (besides the omitted patches as mentioned above): - Split the parse_apply_sb_mount_options() fix into its own patch - Fixed a couple bugs in "ext4: fix up test_dummy_encryption handling for new mount API" Eric Biggers (5): ext4: fix memory leak in parse_apply_sb_mount_options() ext4: only allow test_dummy_encryption when supported ext4: fix up test_dummy_encryption handling for new mount API f2fs: use the updated test_dummy_encryption helper functions fscrypt: remove fscrypt_set_test_dummy_encryption() fs/crypto/policy.c | 13 --- fs/ext4/ext4.h | 6 -- fs/ext4/super.c | 180 +++++++++++++++++++++++----------------- fs/f2fs/super.c | 29 +++++-- include/linux/fscrypt.h | 2 - 5 files changed, 124 insertions(+), 106 deletions(-) -- 2.36.1