[PATCH 1/2] f2fs: fix memory leak of write_io in fill_super()

[PATCH 1/2] f2fs: fix memory leak of write_io in fill_super()

[Chao Yu]

It needs to release memory allocated for sbi->write_io in error path,
otherwise, it will cause memory leak.

Signed-off-by: Chao Yu <yuchao0@huawei.com>
---
 fs/f2fs/super.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index 1cd9138aa1e0..627b9a959714 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -3095,7 +3095,7 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent)
 					GFP_KERNEL);
 		if (!sbi->write_io[i]) {
 			err = -ENOMEM;
-			goto free_options;
+			goto free_bio_info;
 		}
 
 		for (j = HOT; j < n; j++) {
-- 
2.18.0.rc1

[PATCH 2/2] f2fs: fix memory leak of percpu counter in fill_super()

[Chao Yu]

In fill_super -> init_percpu_info, we should destroy percpu counter
in error path, otherwise memory allcoated for percpu counter will
leak.

Signed-off-by: Chao Yu <yuchao0@huawei.com>
---
 fs/f2fs/super.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index 627b9a959714..cc4bd264111e 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -2668,8 +2668,12 @@ static int init_percpu_info(struct f2fs_sb_info *sbi)
 	if (err)
 		return err;
 
-	return percpu_counter_init(&sbi->total_valid_inode_count, 0,
+	err = percpu_counter_init(&sbi->total_valid_inode_count, 0,
 								GFP_KERNEL);
+	if (err)
+		percpu_counter_destroy(&sbi->alloc_valid_block_count);
+
+	return err;
 }
 
 #ifdef CONFIG_BLK_DEV_ZONED
-- 
2.18.0.rc1