diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-11-01 11:36:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-11-01 11:36:35 -0700 |
| commit | cd3e8ea847eea97095aa01de3d12674d35fd0199 (patch) | |
| tree | 309b8c609c7f8f606169405d91c6b77f9feacaa7 /include | |
| parent | 19901165d90fdca1e57c9baa0d5b4c63d15c476a (diff) | |
| parent | b7e072f9b77f4c516df96e0c22ec09f8b2e76ba1 (diff) | |
| download | linux-cd3e8ea847eea97095aa01de3d12674d35fd0199.tar.bz2 | |
Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt
Pull fscrypt updates from Eric Biggers:
"Some cleanups for fs/crypto/:
- Allow 256-bit master keys with AES-256-XTS
- Improve documentation and comments
- Remove unneeded field fscrypt_operations::max_namelen"
* tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt:
fscrypt: improve a few comments
fscrypt: allow 256-bit master keys with AES-256-XTS
fscrypt: improve documentation for inline encryption
fscrypt: clean up comments in bio.c
fscrypt: remove fscrypt_operations::max_namelen
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/fscrypt.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/fscrypt.h b/include/linux/fscrypt.h index e912ed9141d9..91ea9477e9bd 100644 --- a/include/linux/fscrypt.h +++ b/include/linux/fscrypt.h @@ -118,9 +118,6 @@ struct fscrypt_operations { */ bool (*empty_dir)(struct inode *inode); - /* The filesystem's maximum ciphertext filename length, in bytes */ - unsigned int max_namelen; - /* * Check whether the filesystem's inode numbers and UUID are stable, * meaning that they will never be changed even by offline operations |