On 04/24, Eric Biggers wrote:
> From: Eric Biggers <ebiggers@xxxxxxxxxx>
>
> Switch f2fs directory searches to use the fscrypt_match_name() helper
> function. There should be no functional change.
>
> Signed-off-by: Eric Biggers <ebiggers@xxxxxxxxxx>
Acked-by: Jaegeuk Kim <jaegeuk@xxxxxxxxxx>
> ---
> fs/f2fs/dir.c | 28 ++++------------------------
> 1 file changed, 4 insertions(+), 24 deletions(-)
>
> diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c
> index 5df3596a667a..c7ed25fb3003 100644
> --- a/fs/f2fs/dir.c
> +++ b/fs/f2fs/dir.c
> @@ -111,8 +111,6 @@ struct f2fs_dir_entry *find_target_dentry(struct fscrypt_name *fname,
> struct f2fs_dir_entry *de;
> unsigned long bit_pos = 0;
> int max_len = 0;
> - struct fscrypt_str de_name = FSTR_INIT(NULL, 0);
> - struct fscrypt_str *name = &fname->disk_name;
>
> if (max_slots)
> *max_slots = 0;
> @@ -130,29 +128,11 @@ struct f2fs_dir_entry *find_target_dentry(struct fscrypt_name *fname,
> continue;
> }
>
> - if (de->hash_code != namehash)
> - goto not_match;
> -
> - de_name.name = d->filename[bit_pos];
> - de_name.len = le16_to_cpu(de->name_len);
> -
> -#ifdef CONFIG_F2FS_FS_ENCRYPTION
> - if (unlikely(!name->name)) {
> - if (fname->usr_fname->name[0] == '_') {
> - if (de_name.len > 32 &&
> - !memcmp(de_name.name + ((de_name.len - 17) & ~15),
> - fname->crypto_buf.name + 8, 16))
> - goto found;
> - goto not_match;
> - }
> - name->name = fname->crypto_buf.name;
> - name->len = fname->crypto_buf.len;
> - }
> -#endif
> - if (de_name.len == name->len &&
> - !memcmp(de_name.name, name->name, name->len))
> + if (de->hash_code == namehash &&
> + fscrypt_match_name(fname, d->filename[bit_pos],
> + le16_to_cpu(de->name_len)))
> goto found;
> -not_match:
> +
> if (max_slots && max_len > *max_slots)
> *max_slots = max_len;
> max_len = 0;
> --
> 2.12.2.816.g2cccc81164-goog
