diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2015-05-01 16:56:45 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2015-05-01 16:56:45 -0400 |
| commit | 5de0b4d0cd153c471640b13aae6ae6d18d0a4603 (patch) | |
| tree | ea42bad982e25f1c880e363b55e8d1ff82e773fe /fs/ext4/dir.c | |
| parent | 6ddb2447846a8ece111e316a2863c2355023682d (diff) | |
| download | linux-stable-5de0b4d0cd153c471640b13aae6ae6d18d0a4603.tar.gz linux-stable-5de0b4d0cd153c471640b13aae6ae6d18d0a4603.tar.bz2 linux-stable-5de0b4d0cd153c471640b13aae6ae6d18d0a4603.zip | |
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: If4655f144784978ba0305b597bfa1c8d7bb69e63
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
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 61db51a5ce4c..5665d82d2332 100644 --- a/fs/ext4/dir.c +++ b/fs/ext4/dir.c @@ -249,7 +249,7 @@ static int ext4_readdir(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, |