f2fs: do not set free of current section

Yunlong Song · Jaegeuk Kim · commit 3611ce991126 · 2018-08-01T11:52:36.000-07:00
For the case when sbi-&gt;segs_per_sec &gt; 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 &lt;yunlong.song@huawei.com&gt;
Reviewed-by: Chao Yu &lt;yuchao0@huawei.com&gt;
Signed-off-by: Jaegeuk Kim &lt;jaegeuk@kernel.org&gt;
diff --git a/fs/f2fs/segment.h b/fs/f2fs/segment.h
@@ -448,13 +448,16 @@ static inline void __set_test_and_free(struct f2fs_sb_info *sbi,
 	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) {
 			if (test_and_clear_bit(secno, free_i->free_secmap))
 				free_i->free_sections++;
 		}
 	}
+skip_free:
 	spin_unlock(&free_i->segmap_lock);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -448,13 +448,16 @@ static inline void __set_test_and_free(struct f2fs_sb_info *sbi,`
`448`	`448`	`if (test_and_clear_bit(segno, free_i->free_segmap)) {`
`449`	`449`	`free_i->free_segments++;`
`450`	`450`
	`451`	`+ if (IS_CURSEC(sbi, secno))`
	`452`	`+ goto skip_free;`
`451`	`453`	`next = find_next_bit(free_i->free_segmap,`
`452`	`454`	`start_segno + sbi->segs_per_sec, start_segno);`
`453`	`455`	`if (next >= start_segno + sbi->segs_per_sec) {`
`454`	`456`	`if (test_and_clear_bit(secno, free_i->free_secmap))`
`455`	`457`	`free_i->free_sections++;`
`456`	`458`	`}`
`457`	`459`	`}`
	`460`	`+skip_free:`
`458`	`461`	`spin_unlock(&free_i->segmap_lock);`
`459`	`462`	`}`
`460`	`463`