f2fs crypto: avoid unneeded memory allocation in ->readdir
authorChao Yu <yuchao0@huawei.com>
Sun, 28 Aug 2016 14:00:12 +0000 (22:00 +0800)
committerJaegeuk Kim <jaegeuk@kernel.org>
Thu, 8 Sep 2016 00:27:36 +0000 (17:27 -0700)
When decrypting dirents in ->readdir, fscrypt_fname_disk_to_usr won't
change content of original encrypted dirent, we don't need to allocate
additional buffer for storing mirror of it, so get rid of it.

Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
fs/f2fs/dir.c

index 3522f6f2089717975b77cdcbb030a5661ab34136..fbc8ede062bf9ea0784d0679f48966d957640203 100644 (file)
@@ -796,16 +796,9 @@ bool f2fs_fill_dentries(struct dir_context *ctx, struct f2fs_dentry_ptr *d,
                        int save_len = fstr->len;
                        int ret;
 
-                       de_name.name = f2fs_kmalloc(de_name.len, GFP_NOFS);
-                       if (!de_name.name)
-                               return false;
-
-                       memcpy(de_name.name, d->filename[bit_pos], de_name.len);
-
                        ret = fscrypt_fname_disk_to_usr(d->inode,
                                                (u32)de->hash_code, 0,
                                                &de_name, fstr);
-                       kfree(de_name.name);
                        if (ret < 0)
                                return true;
 
This page took 0.030534 seconds and 5 git commands to generate.