diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-02-20 23:29:27 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-02-20 23:29:27 +0300 |
| commit | f18f9845f2f10d3d1fc63e4ad16ee52d2d9292fa (patch) | |
| tree | 2c959ab3f3bdb1280dd741664daef8edd9532c99 /include | |
| parent | dc483c851ff9a3505069cb326221dc0242d44015 (diff) | |
| parent | 097d7c1fcb8d4b52c62a36f94b8f18bc21a24934 (diff) | |
| download | linux-f18f9845f2f10d3d1fc63e4ad16ee52d2d9292fa.tar.xz | |
Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/linux
Pull fscrypt updates from Eric Biggers:
"Simplify the implementation of the test_dummy_encryption mount option
by adding the 'test dummy key' on-demand"
* tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/linux:
fscrypt: clean up fscrypt_add_test_dummy_key()
fs/super.c: stop calling fscrypt_destroy_keyring() from __put_super()
f2fs: stop calling fscrypt_add_test_dummy_key()
ext4: stop calling fscrypt_add_test_dummy_key()
fscrypt: add the test dummy encryption key on-demand
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/fscrypt.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/include/linux/fscrypt.h b/include/linux/fscrypt.h index 4f5f8a651213..44848d870046 100644 --- a/include/linux/fscrypt.h +++ b/include/linux/fscrypt.h @@ -309,8 +309,6 @@ fscrypt_free_dummy_policy(struct fscrypt_dummy_policy *dummy_policy) /* keyring.c */ void fscrypt_destroy_keyring(struct super_block *sb); int fscrypt_ioctl_add_key(struct file *filp, void __user *arg); -int fscrypt_add_test_dummy_key(struct super_block *sb, - const struct fscrypt_dummy_policy *dummy_policy); int fscrypt_ioctl_remove_key(struct file *filp, void __user *arg); int fscrypt_ioctl_remove_key_all_users(struct file *filp, void __user *arg); int fscrypt_ioctl_get_key_status(struct file *filp, void __user *arg); @@ -530,13 +528,6 @@ static inline int fscrypt_ioctl_add_key(struct file *filp, void __user *arg) return -EOPNOTSUPP; } -static inline int -fscrypt_add_test_dummy_key(struct super_block *sb, - const struct fscrypt_dummy_policy *dummy_policy) -{ - return 0; -} - static inline int fscrypt_ioctl_remove_key(struct file *filp, void __user *arg) { return -EOPNOTSUPP; |