summaryrefslogtreecommitdiffstats
path: root/fs/ext4/symlink.c
diff options
context:
space:
mode:
authorTheodore Ts'o2015-05-01 22:56:45 +0200
committerTheodore Ts'o2015-05-01 22:56:45 +0200
commit5de0b4d0cd153c471640b13aae6ae6d18d0a4603 (patch)
treeea42bad982e25f1c880e363b55e8d1ff82e773fe /fs/ext4/symlink.c
parentext4 crypto: enable encryption feature flag (diff)
downloadkernel-qcow2-linux-5de0b4d0cd153c471640b13aae6ae6d18d0a4603.tar.gz
kernel-qcow2-linux-5de0b4d0cd153c471640b13aae6ae6d18d0a4603.tar.xz
kernel-qcow2-linux-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/symlink.c')
-rw-r--r--fs/ext4/symlink.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext4/symlink.c b/fs/ext4/symlink.c
index 136ca0e911fd..ce2ed286ba08 100644
--- a/fs/ext4/symlink.c
+++ b/fs/ext4/symlink.c
@@ -74,7 +74,7 @@ static void *ext4_follow_link(struct dentry *dentry, struct nameidata *nd)
goto errout;
}
pstr.name = paddr;
- res = _ext4_fname_disk_to_usr(ctx, &cstr, &pstr);
+ res = _ext4_fname_disk_to_usr(ctx, NULL, &cstr, &pstr);
if (res < 0)
goto errout;
/* Null-terminate the name */