Commit 5ac206cf authored by Namjae Jeon's avatar Namjae Jeon Committed by Jaegeuk Kim

f2fs: make an accessor to get sections for particular block type

Introduce accessor to get the sections based upon the block type
(node,dents...) and modify the functions : should_do_checkpoint,
has_not_enough_free_secs to use this accessor function to get
the node sections and dent sections.
Signed-off-by: default avatarNamjae Jeon <namjae.jeon@samsung.com>
Signed-off-by: default avatarAmit Sahrawat <a.sahrawat@samsung.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk.kim@samsung.com>
parent 25718423
...@@ -573,6 +573,14 @@ static inline int get_pages(struct f2fs_sb_info *sbi, int count_type) ...@@ -573,6 +573,14 @@ static inline int get_pages(struct f2fs_sb_info *sbi, int count_type)
return atomic_read(&sbi->nr_pages[count_type]); return atomic_read(&sbi->nr_pages[count_type]);
} }
static inline int get_blocktype_secs(struct f2fs_sb_info *sbi, int block_type)
{
unsigned int pages_per_sec = sbi->segs_per_sec *
(1 << sbi->log_blocks_per_seg);
return ((get_pages(sbi, block_type) + pages_per_sec - 1)
>> sbi->log_blocks_per_seg) / sbi->segs_per_sec;
}
static inline block_t valid_user_blocks(struct f2fs_sb_info *sbi) static inline block_t valid_user_blocks(struct f2fs_sb_info *sbi)
{ {
block_t ret; block_t ret;
......
...@@ -106,11 +106,7 @@ static inline int is_idle(struct f2fs_sb_info *sbi) ...@@ -106,11 +106,7 @@ static inline int is_idle(struct f2fs_sb_info *sbi)
static inline bool should_do_checkpoint(struct f2fs_sb_info *sbi) static inline bool should_do_checkpoint(struct f2fs_sb_info *sbi)
{ {
unsigned int pages_per_sec = sbi->segs_per_sec * int node_secs = get_blocktype_secs(sbi, F2FS_DIRTY_NODES);
(1 << sbi->log_blocks_per_seg); int dent_secs = get_blocktype_secs(sbi, F2FS_DIRTY_DENTS);
int node_secs = ((get_pages(sbi, F2FS_DIRTY_NODES) + pages_per_sec - 1)
>> sbi->log_blocks_per_seg) / sbi->segs_per_sec;
int dent_secs = ((get_pages(sbi, F2FS_DIRTY_DENTS) + pages_per_sec - 1)
>> sbi->log_blocks_per_seg) / sbi->segs_per_sec;
return free_sections(sbi) <= (node_secs + 2 * dent_secs + 2); return free_sections(sbi) <= (node_secs + 2 * dent_secs + 2);
} }
...@@ -459,13 +459,8 @@ static inline int get_ssr_segment(struct f2fs_sb_info *sbi, int type) ...@@ -459,13 +459,8 @@ static inline int get_ssr_segment(struct f2fs_sb_info *sbi, int type)
static inline bool has_not_enough_free_secs(struct f2fs_sb_info *sbi) static inline bool has_not_enough_free_secs(struct f2fs_sb_info *sbi)
{ {
unsigned int pages_per_sec = (1 << sbi->log_blocks_per_seg) * int node_secs = get_blocktype_secs(sbi, F2FS_DIRTY_NODES);
sbi->segs_per_sec; int dent_secs = get_blocktype_secs(sbi, F2FS_DIRTY_DENTS);
int node_secs = ((get_pages(sbi, F2FS_DIRTY_NODES) + pages_per_sec - 1)
>> sbi->log_blocks_per_seg) / sbi->segs_per_sec;
int dent_secs = ((get_pages(sbi, F2FS_DIRTY_DENTS) + pages_per_sec - 1)
>> sbi->log_blocks_per_seg) / sbi->segs_per_sec;
if (sbi->por_doing) if (sbi->por_doing)
return false; return false;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment