OrgACRN
/
acrn-kernel
mirror of https://github.com/projectacrn/acrn-kernel.git
1
0
Fork 0
Code Issues Releases Wiki Activity

fscrypt: remove fscrypt_operations::max_namelen 

The max_namelen field is unnecessary, as it is set to 255 (NAME_MAX) on
all filesystems that support fscrypt (or plan to support fscrypt).  For
simplicity, just use NAME_MAX directly instead.

Link: https://lore.kernel.org/r/20210909184513.139281-1-ebiggers@kernel.org
Signed-off-by: Eric Biggers <ebiggers@google.com>
This commit is contained in:
Eric Biggers 2021-09-09 11:45:13 -07:00
parent e4e737bb5c
commit 4373b3dc92
5 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fs/crypto/fname.c
View File

@ -429,8 +429,7 @@ int fscrypt_setup_filename(struct inode *dir, const struct qstr *iname,
if (fscrypt_has_encryption_key(dir)) { if (fscrypt_has_encryption_key(dir)) {
if (!fscrypt_fname_encrypted_size(&dir->i_crypt_info->ci_policy, if (!fscrypt_fname_encrypted_size(&dir->i_crypt_info->ci_policy,
iname->len, iname->len, NAME_MAX,
dir->i_sb->s_cop->max_namelen,
&fname->crypto_buf.len)) &fname->crypto_buf.len))
return -ENAMETOOLONG; return -ENAMETOOLONG;
fname->crypto_buf.name = kmalloc(fname->crypto_buf.len, fname->crypto_buf.name = kmalloc(fname->crypto_buf.len,

1
fs/ext4/super.c
View File

@ -1566,7 +1566,6 @@ static const struct fscrypt_operations ext4_cryptops = {
.set_context = ext4_set_context, .set_context = ext4_set_context,
.get_dummy_policy = ext4_get_dummy_policy, .get_dummy_policy = ext4_get_dummy_policy,
.empty_dir = ext4_empty_dir, .empty_dir = ext4_empty_dir,
.max_namelen = EXT4_NAME_LEN,
.has_stable_inodes = ext4_has_stable_inodes, .has_stable_inodes = ext4_has_stable_inodes,
.get_ino_and_lblk_bits = ext4_get_ino_and_lblk_bits, .get_ino_and_lblk_bits = ext4_get_ino_and_lblk_bits,
}; };

1
fs/f2fs/super.c
View File

@ -2976,7 +2976,6 @@ static const struct fscrypt_operations f2fs_cryptops = {
.set_context = f2fs_set_context, .set_context = f2fs_set_context,
.get_dummy_policy = f2fs_get_dummy_policy, .get_dummy_policy = f2fs_get_dummy_policy,
.empty_dir = f2fs_empty_dir, .empty_dir = f2fs_empty_dir,
.max_namelen = F2FS_NAME_LEN,
.has_stable_inodes = f2fs_has_stable_inodes, .has_stable_inodes = f2fs_has_stable_inodes,
.get_ino_and_lblk_bits = f2fs_get_ino_and_lblk_bits, .get_ino_and_lblk_bits = f2fs_get_ino_and_lblk_bits,
.get_num_devices = f2fs_get_num_devices, .get_num_devices = f2fs_get_num_devices,

1
fs/ubifs/crypto.c
View File

@ -82,5 +82,4 @@ const struct fscrypt_operations ubifs_crypt_operations = {
.get_context = ubifs_crypt_get_context, .get_context = ubifs_crypt_get_context,
.set_context = ubifs_crypt_set_context, .set_context = ubifs_crypt_set_context,
.empty_dir = ubifs_crypt_empty_dir, .empty_dir = ubifs_crypt_empty_dir,
.max_namelen = UBIFS_MAX_NLEN,
}; };

3
include/linux/fscrypt.h
View File

@ -118,9 +118,6 @@ struct fscrypt_operations {
*/ */
bool (*empty_dir)(struct inode *inode); 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, * Check whether the filesystem's inode numbers and UUID are stable,
* meaning that they will never be changed even by offline operations * meaning that they will never be changed even by offline operations