f2fs: remove unnecessary segment bitmap updates

Only one dirty type is set in __locate_dirty_segment and we can know
dirty type of segment. So we don't need to check other dirty types.

Signed-off-by: Changman Lee <cm224.lee@samsung.com>
Signed-off-by: Jaegeuk Kim <jaegeuk.kim@samsung.com>
This commit is contained in:
Changman Lee 2013-10-25 17:31:57 +09:00 committed by Jaegeuk Kim
parent e943a10d94
commit 4625d6aac2
1 changed files with 7 additions and 22 deletions

View File

@ -58,20 +58,10 @@ static void __locate_dirty_segment(struct f2fs_sb_info *sbi, unsigned int segno,
if (dirty_type == DIRTY) { if (dirty_type == DIRTY) {
struct seg_entry *sentry = get_seg_entry(sbi, segno); struct seg_entry *sentry = get_seg_entry(sbi, segno);
enum dirty_type t = DIRTY_HOT_DATA; enum dirty_type t = sentry->type;
dirty_type = sentry->type; if (!test_and_set_bit(segno, dirty_i->dirty_segmap[t]))
dirty_i->nr_dirty[t]++;
if (!test_and_set_bit(segno, dirty_i->dirty_segmap[dirty_type]))
dirty_i->nr_dirty[dirty_type]++;
/* Only one bitmap should be set */
for (; t <= DIRTY_COLD_NODE; t++) {
if (t == dirty_type)
continue;
if (test_and_clear_bit(segno, dirty_i->dirty_segmap[t]))
dirty_i->nr_dirty[t]--;
}
} }
} }
@ -84,16 +74,11 @@ static void __remove_dirty_segment(struct f2fs_sb_info *sbi, unsigned int segno,
dirty_i->nr_dirty[dirty_type]--; dirty_i->nr_dirty[dirty_type]--;
if (dirty_type == DIRTY) { if (dirty_type == DIRTY) {
enum dirty_type t = DIRTY_HOT_DATA; struct seg_entry *sentry = get_seg_entry(sbi, segno);
enum dirty_type t = sentry->type;
/* clear its dirty bitmap */ if (test_and_clear_bit(segno, dirty_i->dirty_segmap[t]))
for (; t <= DIRTY_COLD_NODE; t++) { dirty_i->nr_dirty[t]--;
if (test_and_clear_bit(segno,
dirty_i->dirty_segmap[t])) {
dirty_i->nr_dirty[t]--;
break;
}
}
if (get_valid_blocks(sbi, segno, sbi->segs_per_sec) == 0) if (get_valid_blocks(sbi, segno, sbi->segs_per_sec) == 0)
clear_bit(GET_SECNO(sbi, segno), clear_bit(GET_SECNO(sbi, segno),