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/super.c | |
| parent | dc483c851ff9a3505069cb326221dc0242d44015 (diff) | |
| parent | 097d7c1fcb8d4b52c62a36f94b8f18bc21a24934 (diff) | |
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/super.c')
| -rw-r--r-- | fs/super.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/super.c b/fs/super.c index cf737ec2bd05..8e531174e7c2 100644 --- a/fs/super.c +++ b/fs/super.c @@ -291,7 +291,6 @@ static void __put_super(struct super_block *s) WARN_ON(s->s_inode_lru.node); WARN_ON(!list_empty(&s->s_mounts)); security_sb_free(s); - fscrypt_destroy_keyring(s); put_user_ns(s->s_user_ns); kfree(s->s_subtype); call_rcu(&s->rcu, destroy_super_rcu); |