diff options
author | Chao Yu <yuchao0@huawei.com> | 2016-08-28 10:00:12 -0400 |
---|---|---|
committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2016-09-07 20:27:36 -0400 |
commit | e06f86e61d7a67fe6e826010f57aa39c674f4b1b (patch) | |
tree | 5f58117677c9badb7416822464f19354fdc2553d | |
parent | 9421d57051c534c7477f98d0576b876237fbbc4c (diff) |
f2fs crypto: avoid unneeded memory allocation in ->readdir
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>
-rw-r--r-- | fs/f2fs/dir.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c index 3522f6f20897..fbc8ede062bf 100644 --- a/fs/f2fs/dir.c +++ b/fs/f2fs/dir.c | |||
@@ -796,16 +796,9 @@ bool f2fs_fill_dentries(struct dir_context *ctx, struct f2fs_dentry_ptr *d, | |||
796 | int save_len = fstr->len; | 796 | int save_len = fstr->len; |
797 | int ret; | 797 | int ret; |
798 | 798 | ||
799 | de_name.name = f2fs_kmalloc(de_name.len, GFP_NOFS); | ||
800 | if (!de_name.name) | ||
801 | return false; | ||
802 | |||
803 | memcpy(de_name.name, d->filename[bit_pos], de_name.len); | ||
804 | |||
805 | ret = fscrypt_fname_disk_to_usr(d->inode, | 799 | ret = fscrypt_fname_disk_to_usr(d->inode, |
806 | (u32)de->hash_code, 0, | 800 | (u32)de->hash_code, 0, |
807 | &de_name, fstr); | 801 | &de_name, fstr); |
808 | kfree(de_name.name); | ||
809 | if (ret < 0) | 802 | if (ret < 0) |
810 | return true; | 803 | return true; |
811 | 804 | ||