| From foo@baz Mon Sep 17 12:33:31 CEST 2018 |
| From: Yunlong Song <yunlong.song@huawei.com> |
| Date: Thu, 12 Jul 2018 23:09:26 +0800 |
| Subject: f2fs: do not set free of current section |
| |
| From: Yunlong Song <yunlong.song@huawei.com> |
| |
| [ Upstream commit 3611ce9911267cb93d364bd71ddea6821278d11f ] |
| |
| For the case when sbi->segs_per_sec > 1, take section:segment = 5 for |
| example, if segment 1 is just used and allocate new segment 2, and the |
| blocks of segment 1 is invalidated, at this time, the previous code will |
| use __set_test_and_free to free the free_secmap and free_sections++, |
| this is not correct since it is still a current section, so fix it. |
| |
| Signed-off-by: Yunlong Song <yunlong.song@huawei.com> |
| Reviewed-by: Chao Yu <yuchao0@huawei.com> |
| Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org> |
| Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| fs/f2fs/segment.h | 3 +++ |
| 1 file changed, 3 insertions(+) |
| |
| --- a/fs/f2fs/segment.h |
| +++ b/fs/f2fs/segment.h |
| @@ -414,6 +414,8 @@ static inline void __set_test_and_free(s |
| if (test_and_clear_bit(segno, free_i->free_segmap)) { |
| free_i->free_segments++; |
| |
| + if (IS_CURSEC(sbi, secno)) |
| + goto skip_free; |
| next = find_next_bit(free_i->free_segmap, |
| start_segno + sbi->segs_per_sec, start_segno); |
| if (next >= start_segno + sbi->segs_per_sec) { |
| @@ -421,6 +423,7 @@ static inline void __set_test_and_free(s |
| free_i->free_sections++; |
| } |
| } |
| +skip_free: |
| spin_unlock(&free_i->segmap_lock); |
| } |
| |
