Re: [f2fs-dev] [PATCH] f2fs: fix to check result of new_curseg in f2fs_allocate_segment_for_resize

[Chao Yu]

On 2024/3/1 19:36, Zhiguo Niu wrote:

new_curseg may return error if get_new_segment fail, so its result
should be check in its caller f2fs_allocate_segment_for_resize,
alos pass this results to free_segment_range.

Zhiguo,

What about handling all error paths of new_curseg() and change_curseg()
in one patch?

Thanks,

Signed-off-by: Zhiguo Niu <zhiguo....@unisoc.com>
---
  fs/f2fs/f2fs.h    | 2 +-
  fs/f2fs/gc.c      | 7 +++++--
  fs/f2fs/segment.c | 9 +++++++--
  3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 4331012..39dda7d 100644
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -3701,7 +3701,7 @@ void f2fs_clear_prefree_segments(struct f2fs_sb_info *sbi,
  void f2fs_init_inmem_curseg(struct f2fs_sb_info *sbi);
  void f2fs_save_inmem_curseg(struct f2fs_sb_info *sbi);
  void f2fs_restore_inmem_curseg(struct f2fs_sb_info *sbi);
-void f2fs_allocate_segment_for_resize(struct f2fs_sb_info *sbi, int type,
+int 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);
diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c
index c60b747..7a458fa 100644
--- a/fs/f2fs/gc.c
+++ b/fs/f2fs/gc.c
@@ -2037,8 +2037,11 @@ static int free_segment_range(struct f2fs_sb_info *sbi,
        mutex_unlock(&DIRTY_I(sbi)->seglist_lock);

/* Move out cursegs from the target range */

-       for (type = CURSEG_HOT_DATA; type < NR_CURSEG_PERSIST_TYPE; type++)
-               f2fs_allocate_segment_for_resize(sbi, type, start, end);
+       for (type = CURSEG_HOT_DATA; type < NR_CURSEG_PERSIST_TYPE; type++) {
+               err = f2fs_allocate_segment_for_resize(sbi, type, start, end);
+               if (err)
+                       goto out;
+       }

/* do GC to move out valid blocks in the range */

        err = f2fs_gc_range(sbi, start, end, dry_run, 0);
diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index 1bb3019..2a07b9d 100644
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -3071,11 +3071,12 @@ static bool need_new_seg(struct f2fs_sb_info *sbi, int 
type)
        return false;
  }

-void f2fs_allocate_segment_for_resize(struct f2fs_sb_info *sbi, int type,

+int f2fs_allocate_segment_for_resize(struct f2fs_sb_info *sbi, int type,
                                        unsigned int start, unsigned int end)
  {
        struct curseg_info *curseg = CURSEG_I(sbi, type);
        unsigned int segno;
+       int err = 0;

f2fs_down_read(&SM_I(sbi)->curseg_lock);

        mutex_lock(&curseg->curseg_mutex);
@@ -3089,7 +3090,10 @@ void f2fs_allocate_segment_for_resize(struct 
f2fs_sb_info *sbi, int type,
                change_curseg(sbi, type);
        else
                new_curseg(sbi, type, true);
-
+       if (curseg->segno == NULL_SEGNO) {
+               err = -ENOSPC;
+               goto unlock;
+       }
        stat_inc_seg_type(sbi, curseg);

locate_dirty_segment(sbi, segno);

@@ -3102,6 +3106,7 @@ void f2fs_allocate_segment_for_resize(struct f2fs_sb_info 
*sbi, int type,

mutex_unlock(&curseg->curseg_mutex);

        f2fs_up_read(&SM_I(sbi)->curseg_lock);
+       return err;
  }

static int __allocate_new_segment(struct f2fs_sb_info *sbi, int type,

_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel