diff mbox series

[v5,05/16] f2fs: allocate inode by using alloc_inode_sb()

Message ID 20211220085649.8196-6-songmuchun@bytedance.com (mailing list archive)
State New
Headers show
Series Optimize list lru memory consumption | expand

Commit Message

Muchun Song Dec. 20, 2021, 8:56 a.m. UTC 
The inode allocation is supposed to use alloc_inode_sb(), so convert
kmem_cache_alloc() to alloc_inode_sb().

Signed-off-by: Muchun Song <songmuchun@bytedance.com>
---
 fs/f2fs/super.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

Comments

Roman Gushchin Jan. 11, 2022, 7:03 p.m. UTC | #1 
On Mon, Dec 20, 2021 at 04:56:38PM +0800, Muchun Song wrote:
> The inode allocation is supposed to use alloc_inode_sb(), so convert
> kmem_cache_alloc() to alloc_inode_sb().
> 
> Signed-off-by: Muchun Song <songmuchun@bytedance.com>

LGTM

Acked-by: Roman Gushchin <guro@fb.com>

> ---
>  fs/f2fs/super.c | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
> index 040b6d02e1d8..6cdbf520b435 100644
> --- a/fs/f2fs/super.c
> +++ b/fs/f2fs/super.c
> @@ -1311,8 +1311,12 @@ static struct inode *f2fs_alloc_inode(struct super_block *sb)
>  {
>  	struct f2fs_inode_info *fi;
>  
> -	fi = f2fs_kmem_cache_alloc(f2fs_inode_cachep,
> -				GFP_F2FS_ZERO, false, F2FS_SB(sb));
> +	if (time_to_inject(F2FS_SB(sb), FAULT_SLAB_ALLOC)) {
> +		f2fs_show_injection_info(F2FS_SB(sb), FAULT_SLAB_ALLOC);
> +		return NULL;
> +	}
> +
> +	fi = alloc_inode_sb(sb, f2fs_inode_cachep, GFP_F2FS_ZERO);
>  	if (!fi)
>  		return NULL;
>  
> -- 
> 2.11.0
>
diff mbox series

Patch

diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index 040b6d02e1d8..6cdbf520b435 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -1311,8 +1311,12 @@  static struct inode *f2fs_alloc_inode(struct super_block *sb)
 {
 	struct f2fs_inode_info *fi;
 
-	fi = f2fs_kmem_cache_alloc(f2fs_inode_cachep,
-				GFP_F2FS_ZERO, false, F2FS_SB(sb));
+	if (time_to_inject(F2FS_SB(sb), FAULT_SLAB_ALLOC)) {
+		f2fs_show_injection_info(F2FS_SB(sb), FAULT_SLAB_ALLOC);
+		return NULL;
+	}
+
+	fi = alloc_inode_sb(sb, f2fs_inode_cachep, GFP_F2FS_ZERO);
 	if (!fi)
 		return NULL;