diff options
| author | Eric Biggers <ebiggers@google.com> | 2017-04-24 10:00:11 -0700 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2017-05-04 11:44:38 -0400 |
| commit | 067d1023b6beeded688500d417e40e16981437e0 (patch) | |
| tree | 6fe281855041f786d0e276d1054d0646635a3f20 /fs | |
| parent | 17159420a6c18bb3515ff85598b5ccf1a572763d (diff) | |
| download | linux-067d1023b6beeded688500d417e40e16981437e0.tar.bz2 | |
ext4: switch to using fscrypt_match_name()
Switch ext4 directory searches to use the fscrypt_match_name() helper
function. There should be no functional change.
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ext4/namei.c | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index 2d866e4a9e7a..a87e49c31248 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c @@ -1245,29 +1245,17 @@ static void dx_insert_block(struct dx_frame *frame, u32 hash, ext4_lblk_t block) static inline int ext4_match(struct ext4_filename *fname, struct ext4_dir_entry_2 *de) { - const void *name = fname_name(fname); - u32 len = fname_len(fname); + struct fscrypt_name f; if (!de->inode) return 0; + f.usr_fname = fname->usr_fname; + f.disk_name = fname->disk_name; #ifdef CONFIG_EXT4_FS_ENCRYPTION - if (unlikely(!name)) { - if (fname->usr_fname->name[0] == '_') { - int ret; - if (de->name_len <= 32) - return 0; - ret = memcmp(de->name + ((de->name_len - 17) & ~15), - fname->crypto_buf.name + 8, 16); - return (ret == 0) ? 1 : 0; - } - name = fname->crypto_buf.name; - len = fname->crypto_buf.len; - } + f.crypto_buf = fname->crypto_buf; #endif - if (de->name_len != len) - return 0; - return (memcmp(de->name, name, len) == 0) ? 1 : 0; + return fscrypt_match_name(&f, de->name, de->name_len); } /* |