diff options
| author | Theodore Ts'o <tytso@google.com> | 2015-04-29 12:13:00 -0400 |
|---|---|---|
| committer | Mister Oyster <oysterized@gmail.com> | 2017-05-27 19:40:00 +0200 |
| commit | fbd33f1779611cd9b44e8de3ff8a2a9650ddf8bf (patch) | |
| tree | dea678e97f0c7bf793f7fd788d7c1a422b1c0b07 /fs/ext4/dir.c | |
| parent | a6114c395006b0f0093e0ec3247e7bb22ceab027 (diff) | |
ext4 crypto: simplify and speed up filename encryption
Avoid using SHA-1 when calculating the user-visible filename when the
encryption key is available, and avoid decrypting lots of filenames
when searching for a directory entry in a directory block.
Change-Id: Ifff4c07a80740112e2e984d2da3105e2fe41ab68
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Theodore Ts'o <tytso@google.com>
Diffstat (limited to 'fs/ext4/dir.c')
| -rw-r--r-- | fs/ext4/dir.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext4/dir.c b/fs/ext4/dir.c index 18a40854e..ffb83e87b 100644 --- a/fs/ext4/dir.c +++ b/fs/ext4/dir.c @@ -252,7 +252,7 @@ static int ext4_readdir2(struct file *file, struct dir_context *ctx) } else { /* Directory is encrypted */ err = ext4_fname_disk_to_usr(enc_ctx, - de, &fname_crypto_str); + NULL, de, &fname_crypto_str); if (err < 0) goto errout; if (!dir_emit(ctx, |