f2fs: fix to check return value __allocate_new_segment

Zhiguo Niu · Jaegeuk Kim · commit 28f66cc65403 · 2024-03-04T09:52:51.000-08:00
__allocate_new_segment may return error when get_new_segment
fails, so its caller should check its return value.

Signed-off-by: Zhiguo Niu &lt;zhiguo.niu@unisoc.com&gt;
Reviewed-by: Chao Yu &lt;chao@kernel.org&gt;
Signed-off-by: Jaegeuk Kim &lt;jaegeuk@kernel.org&gt;
diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
@@ -3705,7 +3705,7 @@ void f2fs_allocate_segment_for_resize(struct f2fs_sb_info *sbi, int type,
 					unsigned int start, unsigned int end);
 int f2fs_allocate_new_section(struct f2fs_sb_info *sbi, int type, bool force);
 int f2fs_allocate_pinning_section(struct f2fs_sb_info *sbi);
-void f2fs_allocate_new_segments(struct f2fs_sb_info *sbi);
+int f2fs_allocate_new_segments(struct f2fs_sb_info *sbi);
 int f2fs_trim_fs(struct f2fs_sb_info *sbi, struct fstrim_range *range);
 bool f2fs_exist_trim_candidates(struct f2fs_sb_info *sbi,
 					struct cp_control *cpc);
diff --git a/fs/f2fs/recovery.c b/fs/f2fs/recovery.c
@@ -851,7 +851,7 @@ static int recover_data(struct f2fs_sb_info *sbi, struct list_head *inode_list,
 		f2fs_ra_meta_pages_cond(sbi, blkaddr, ra_blocks);
 	}
 	if (!err)
-		f2fs_allocate_new_segments(sbi);
+		err = f2fs_allocate_new_segments(sbi);
 	return err;
 }
 
diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
@@ -3163,16 +3163,19 @@ int f2fs_allocate_pinning_section(struct f2fs_sb_info *sbi)
 	return err;
 }
 
-void f2fs_allocate_new_segments(struct f2fs_sb_info *sbi)
+int f2fs_allocate_new_segments(struct f2fs_sb_info *sbi)
 {
 	int i;
+	int err = 0;
 
 	f2fs_down_read(&SM_I(sbi)->curseg_lock);
 	down_write(&SIT_I(sbi)->sentry_lock);
 	for (i = CURSEG_HOT_DATA; i <= CURSEG_COLD_DATA; i++)
-		__allocate_new_segment(sbi, i, false, false);
+		err += __allocate_new_segment(sbi, i, false, false);
 	up_write(&SIT_I(sbi)->sentry_lock);
 	f2fs_up_read(&SM_I(sbi)->curseg_lock);
+
+	return err;
 }
 
 bool f2fs_exist_trim_candidates(struct f2fs_sb_info *sbi,

Original file line number	Diff line number	Diff line change
`@@ -851,7 +851,7 @@ static int recover_data(struct f2fs_sb_info sbi, struct list_head inode_list,`
`851`	`851`	`f2fs_ra_meta_pages_cond(sbi, blkaddr, ra_blocks);`
`852`	`852`	`}`
`853`	`853`	`if (!err)`
`854`		`- f2fs_allocate_new_segments(sbi);`
	`854`	`+ err = f2fs_allocate_new_segments(sbi);`
`855`	`855`	`return err;`
`856`	`856`	`}`
`857`	`857`
Original file line number	Diff line number	Diff line change
`@@ -3163,16 +3163,19 @@ int f2fs_allocate_pinning_section(struct f2fs_sb_info *sbi)`
`3163`	`3163`	`return err;`
`3164`	`3164`	`}`
`3165`	`3165`
`3166`		`-void f2fs_allocate_new_segments(struct f2fs_sb_info *sbi)`
	`3166`	`+int f2fs_allocate_new_segments(struct f2fs_sb_info *sbi)`
`3167`	`3167`	`{`
`3168`	`3168`	`int i;`
	`3169`	`+ int err = 0;`
`3169`	`3170`
`3170`	`3171`	`f2fs_down_read(&SM_I(sbi)->curseg_lock);`
`3171`	`3172`	`down_write(&SIT_I(sbi)->sentry_lock);`
`3172`	`3173`	`for (i = CURSEG_HOT_DATA; i <= CURSEG_COLD_DATA; i++)`
`3173`		`- __allocate_new_segment(sbi, i, false, false);`
	`3174`	`+ err += __allocate_new_segment(sbi, i, false, false);`
`3174`	`3175`	`up_write(&SIT_I(sbi)->sentry_lock);`
`3175`	`3176`	`f2fs_up_read(&SM_I(sbi)->curseg_lock);`
	`3177`	`+`
	`3178`	`+ return err;`
`3176`	`3179`	`}`
`3177`	`3180`
`3178`	`3181`	`bool f2fs_exist_trim_candidates(struct f2fs_sb_info *sbi,`