Skip to contentSkip to conversation

f2fs crypto: avoid unneeded memory allocation in ->readdir

PATCH New Chao Yu 1 participant 1 message Aug 28, 2016 F2FS file system

lore
Share & tools
lore

Chao Yu

author maintainer
#0 lore raw

PATCH 1/1 f2fs crypto: avoid unneeded memory allocation in ->readdir

From: Chao Yu <[email protected]>

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.

---
 fs/f2fs/dir.c | 7 -------
 1 file changed, 7 deletions(-)
fs/f2fs/dir.c +0 -7
index 3522f6f..fbc8ede 100644
@@ -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;
 
Signature · 1 line
2.7.2