On 2017/2/21 16:59, Yunlong Song wrote:
> SIT information should be updated before segment allocation, since SSR needs
> latest valid block information. Current code does not update the old_blkaddr
> info in sit_entry, so adjust the allocate_segment to its proper location. Commit
> 5e443818fa0b2a2845561ee25bec181424fb2889 ("f2fs: handle dirty segments inside
> refresh_sit_entry") puts it into wrong location.
Not a big deal, because we only count invalid block which has been checkpointed,
so current order won't change the result of allocation with SSR.
Anyway, it's OK to me. :)
Reviewed-by: Chao Yu <yuchao0@xxxxxxxxxx>
>
> Signed-off-by: Yunlong Song <yunlong.song@xxxxxxxxxx>
> ---
> fs/f2fs/segment.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
> index df2ff5c..89052df 100644
> --- a/fs/f2fs/segment.c
> +++ b/fs/f2fs/segment.c
> @@ -1743,14 +1743,15 @@ void allocate_data_block(struct f2fs_sb_info *sbi, struct page *page,
>
> stat_inc_block_count(sbi, curseg);
>
> - if (!__has_curseg_space(sbi, type))
> - sit_i->s_ops->allocate_segment(sbi, type, false);
> /*
> * SIT information should be updated before segment allocation,
> * since SSR needs latest valid block information.
> */
> refresh_sit_entry(sbi, old_blkaddr, *new_blkaddr);
>
> + if (!__has_curseg_space(sbi, type))
> + sit_i->s_ops->allocate_segment(sbi, type, false);
> +
> mutex_unlock(&sit_i->sentry_lock);
>
> if (page && IS_NODESEG(type))
>
