diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2023-02-20 12:29:27 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-02-20 12:29:27 -0800 |
| commit | f18f9845f2f10d3d1fc63e4ad16ee52d2d9292fa (patch) | |
| tree | 2c959ab3f3bdb1280dd741664daef8edd9532c99 /fs/crypto/policy.c | |
| parent | Merge tag 'erofs-for-6.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs (diff) | |
| parent | fscrypt: clean up fscrypt_add_test_dummy_key() (diff) | |
| download | linux-rng-f18f9845f2f10d3d1fc63e4ad16ee52d2d9292fa.tar.xz linux-rng-f18f9845f2f10d3d1fc63e4ad16ee52d2d9292fa.zip | |
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 'fs/crypto/policy.c')
| -rw-r--r-- | fs/crypto/policy.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/crypto/policy.c b/fs/crypto/policy.c index fa09c925bda8..3b5fcb6402ea 100644 --- a/fs/crypto/policy.c +++ b/fs/crypto/policy.c @@ -53,8 +53,7 @@ int fscrypt_policy_to_key_spec(const union fscrypt_policy *policy, } } -static const union fscrypt_policy * -fscrypt_get_dummy_policy(struct super_block *sb) +const union fscrypt_policy *fscrypt_get_dummy_policy(struct super_block *sb) { if (!sb->s_cop->get_dummy_policy) return NULL; |