korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-24 20:54:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

f2fs: introduce f2fs_casefolded_name slab cache

Browse Source 
Add a slab cache: "f2fs_casefolded_name" for memory allocation
of casefold name.

Reviewed-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
This commit is contained in:
Chao Yu 2021-06-11 07:46:30 +08:00 committed by Jaegeuk Kim
parent 859fca6b70
commit 4d9a2bb1a6
3 changed files with 40 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fs/f2fs/dir.c
View File

@ -16,6 +16,10 @@
#include "xattr.h" #include "xattr.h"
#include <trace/events/f2fs.h> #include <trace/events/f2fs.h>
#ifdef CONFIG_UNICODE
extern struct kmem_cache *f2fs_cf_name_slab;
#endif
static unsigned long dir_blocks(struct inode *inode) static unsigned long dir_blocks(struct inode *inode)
{ {
return ((unsigned long long) (i_size_read(inode) + PAGE_SIZE - 1)) return ((unsigned long long) (i_size_read(inode) + PAGE_SIZE - 1))
@ -77,10 +81,9 @@ int f2fs_init_casefolded_name(const struct inode *dir,
{ {
#ifdef CONFIG_UNICODE #ifdef CONFIG_UNICODE
struct super_block *sb = dir->i_sb; struct super_block *sb = dir->i_sb;
struct f2fs_sb_info *sbi = F2FS_SB(sb);
if (IS_CASEFOLDED(dir)) { if (IS_CASEFOLDED(dir)) {
fname->cf_name.name = f2fs_kmalloc(sbi, F2FS_NAME_LEN, fname->cf_name.name = kmem_cache_alloc(f2fs_cf_name_slab,
GFP_NOFS); GFP_NOFS);
if (!fname->cf_name.name) if (!fname->cf_name.name)
return -ENOMEM; return -ENOMEM;
@ -89,7 +92,7 @@ int f2fs_init_casefolded_name(const struct inode *dir,
fname->cf_name.name, fname->cf_name.name,
F2FS_NAME_LEN); F2FS_NAME_LEN);
if ((int)fname->cf_name.len <= 0) { if ((int)fname->cf_name.len <= 0) {
kfree(fname->cf_name.name); kmem_cache_free(f2fs_cf_name_slab, fname->cf_name.name);
fname->cf_name.name = NULL; fname->cf_name.name = NULL;
if (sb_has_strict_encoding(sb)) if (sb_has_strict_encoding(sb))
return -EINVAL; return -EINVAL;
@ -172,8 +175,10 @@ void f2fs_free_filename(struct f2fs_filename *fname)
fname->crypto_buf.name = NULL; fname->crypto_buf.name = NULL;
#endif #endif
#ifdef CONFIG_UNICODE #ifdef CONFIG_UNICODE
kfree(fname->cf_name.name); if (fname->cf_name.name) {
kmem_cache_free(f2fs_cf_name_slab, fname->cf_name.name);
fname->cf_name.name = NULL; fname->cf_name.name = NULL;
}
#endif #endif
} }

6
fs/f2fs/recovery.c
View File

@ -45,6 +45,10 @@
static struct kmem_cache *fsync_entry_slab; static struct kmem_cache *fsync_entry_slab;
#ifdef CONFIG_UNICODE
extern struct kmem_cache *f2fs_cf_name_slab;
#endif
bool f2fs_space_for_roll_forward(struct f2fs_sb_info *sbi) bool f2fs_space_for_roll_forward(struct f2fs_sb_info *sbi)
{ {
s64 nalloc = percpu_counter_sum_positive(&sbi->alloc_valid_block_count); s64 nalloc = percpu_counter_sum_positive(&sbi->alloc_valid_block_count);
@ -145,7 +149,7 @@ static int init_recovered_filename(const struct inode *dir,
f2fs_hash_filename(dir, fname); f2fs_hash_filename(dir, fname);
#ifdef CONFIG_UNICODE #ifdef CONFIG_UNICODE
/* Case-sensitive match is fine for recovery */ /* Case-sensitive match is fine for recovery */
kfree(fname->cf_name.name); kmem_cache_free(f2fs_cf_name_slab, fname->cf_name.name);
fname->cf_name.name = NULL; fname->cf_name.name = NULL;
#endif #endif
} else { } else {

24
fs/f2fs/super.c
View File

@ -277,6 +277,24 @@ static int f2fs_sb_read_encoding(const struct f2fs_super_block *sb,
return 0; return 0;
} }
struct kmem_cache *f2fs_cf_name_slab;
static int __init f2fs_create_casefold_cache(void)
{
f2fs_cf_name_slab = f2fs_kmem_cache_create("f2fs_casefolded_name",
F2FS_NAME_LEN);
if (!f2fs_cf_name_slab)
return -ENOMEM;
return 0;
}
static void f2fs_destroy_casefold_cache(void)
{
kmem_cache_destroy(f2fs_cf_name_slab);
}
#else
static int __init f2fs_create_casefold_cache(void) { return 0; }
static void f2fs_destroy_casefold_cache(void) { }
#endif #endif
static inline void limit_reserve_root(struct f2fs_sb_info *sbi) static inline void limit_reserve_root(struct f2fs_sb_info *sbi)
@ -4319,7 +4337,12 @@ static int __init init_f2fs_fs(void)
err = f2fs_init_compress_cache(); err = f2fs_init_compress_cache();
if (err) if (err)
goto free_compress_mempool; goto free_compress_mempool;
err = f2fs_create_casefold_cache();
if (err)
goto free_compress_cache;
return 0; return 0;
free_compress_cache:
f2fs_destroy_compress_cache();
free_compress_mempool: free_compress_mempool:
f2fs_destroy_compress_mempool(); f2fs_destroy_compress_mempool();
free_bioset: free_bioset:
@ -4355,6 +4378,7 @@ fail:
static void __exit exit_f2fs_fs(void) static void __exit exit_f2fs_fs(void)
{ {
f2fs_destroy_casefold_cache();
f2fs_destroy_compress_cache(); f2fs_destroy_compress_cache();
f2fs_destroy_compress_mempool(); f2fs_destroy_compress_mempool();
f2fs_destroy_bioset(); f2fs_destroy_bioset();