Reviewed-by: Daeho Jeong <daehoje...@google.com>
Thanks,
On Sun, Feb 25, 2024 at 5:33 PM Chao Yu <c...@kernel.org> wrote:
>
> In f2fs_allocate_data_block(), before skip allocating new segment
> for DATA_PINNED log header, it needs to tag log header as unloaded
> one to avoid skipping logic in locate_dirty_segment() and
> __f2fs_save_inmem_curseg().
>
> Signed-off-by: Chao Yu <c...@kernel.org>
> ---
> fs/f2fs/segment.c | 19 +++++++++++++++----
> 1 file changed, 15 insertions(+), 4 deletions(-)
>
> diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
> index c159b0985596..5e45afd69f3f 100644
> --- a/fs/f2fs/segment.c
> +++ b/fs/f2fs/segment.c
> @@ -3101,12 +3101,16 @@ static int __allocate_new_segment(struct f2fs_sb_info
> *sbi, int type,
> struct curseg_info *curseg = CURSEG_I(sbi, type);
> unsigned int old_segno;
>
> + if (type == CURSEG_COLD_DATA_PINNED && !curseg->inited)
> + goto allocate;
> +
> if (!force && curseg->inited &&
> !curseg->next_blkoff &&
> !get_valid_blocks(sbi, curseg->segno, new_sec) &&
> !get_ckpt_valid_blocks(sbi, curseg->segno, new_sec))
> return 0;
>
> +allocate:
> old_segno = curseg->segno;
> if (new_curseg(sbi, type, true))
> return -EAGAIN;
> @@ -3451,6 +3455,13 @@ static void f2fs_randomize_chunk(struct f2fs_sb_info
> *sbi,
> get_random_u32_inclusive(1, sbi->max_fragment_hole);
> }
>
> +static void reset_curseg_fields(struct curseg_info *curseg)
> +{
> + curseg->inited = false;
> + curseg->segno = NULL_SEGNO;
> + curseg->next_segno = 0;
> +}
> +
> int f2fs_allocate_data_block(struct f2fs_sb_info *sbi, struct page *page,
> block_t old_blkaddr, block_t *new_blkaddr,
> struct f2fs_summary *sum, int type,
> @@ -3516,8 +3527,10 @@ int f2fs_allocate_data_block(struct f2fs_sb_info *sbi,
> struct page *page,
> */
> if (segment_full) {
> if (type == CURSEG_COLD_DATA_PINNED &&
> - !((curseg->segno + 1) % sbi->segs_per_sec))
> + !((curseg->segno + 1) % sbi->segs_per_sec)) {
> + reset_curseg_fields(curseg);
> goto skip_new_segment;
> + }
>
> if (from_gc) {
> get_atssr_segment(sbi, type, se->type,
> @@ -4595,9 +4608,7 @@ static int build_curseg(struct f2fs_sb_info *sbi)
> array[i].seg_type = CURSEG_COLD_DATA;
> else if (i == CURSEG_ALL_DATA_ATGC)
> array[i].seg_type = CURSEG_COLD_DATA;
> - array[i].segno = NULL_SEGNO;
> - array[i].next_blkoff = 0;
> - array[i].inited = false;
> + reset_curseg_fields(&array[i]);
> }
> return restore_curseg_summaries(sbi);
> }
> --
> 2.40.1
>
>
>
> _______________________________________________
> Linux-f2fs-devel mailing list
> Linux-f2fs-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
