diff options
| author | Eric Biggers <ebiggers@google.com> | 2018-04-30 15:51:44 -0700 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2018-05-20 16:21:03 -0400 |
| commit | e12ee6836a3fd3c6ebc9b2dc8a7974af592340d0 (patch) | |
| tree | 64b030404b24cab9026483250f29aaca36741c5c /fs/ext4 | |
| parent | 0c4cdb27caa40167a7369a986afcde3d1d913b06 (diff) | |
| download | linux-e12ee6836a3fd3c6ebc9b2dc8a7974af592340d0.tar.bz2 | |
fscrypt: make fscrypt_operations.max_namelen an integer
Now ->max_namelen() is only called to limit the filename length when
adding NUL padding, and only for real filenames -- not symlink targets.
It also didn't give the correct length for symlink targets anyway since
it forgot to subtract 'sizeof(struct fscrypt_symlink_data)'.
Thus, change ->max_namelen from a function to a simple 'unsigned int'
that gives the filesystem's maximum filename length.
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'fs/ext4')
| -rw-r--r-- | fs/ext4/super.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index eb104e8476f0..502c36da292c 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -1237,19 +1237,13 @@ static bool ext4_dummy_context(struct inode *inode) return DUMMY_ENCRYPTION_ENABLED(EXT4_SB(inode->i_sb)); } -static unsigned ext4_max_namelen(struct inode *inode) -{ - return S_ISLNK(inode->i_mode) ? inode->i_sb->s_blocksize : - EXT4_NAME_LEN; -} - static const struct fscrypt_operations ext4_cryptops = { .key_prefix = "ext4:", .get_context = ext4_get_context, .set_context = ext4_set_context, .dummy_context = ext4_dummy_context, .empty_dir = ext4_empty_dir, - .max_namelen = ext4_max_namelen, + .max_namelen = EXT4_NAME_LEN, }; #endif |