| Message ID | 20230919201532.310085-2-shikemeng@huaweicloud.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | cleanups and unit test for mballoc | expand |
Kemeng Shi <shikemeng@huaweicloud.com> writes: > As state could only be either 0 or 1, just make it bool. Sure. > > Signed-off-by: Kemeng Shi <shikemeng@huaweicloud.com> > --- > fs/ext4/ext4.h | 2 +- > fs/ext4/fast_commit.c | 8 ++++---- > fs/ext4/mballoc.c | 2 +- > 3 files changed, 6 insertions(+), 6 deletions(-) But why not convert at all places? git grep "ext4_mb_mark_bb" . fs/ext4/ext4.h:extern void ext4_mb_mark_bb(struct super_block *sb, ext4_fsblk_t block, fs/ext4/extents.c: ext4_mb_mark_bb(inode->i_sb, fs/ext4/extents.c: ext4_mb_mark_bb(inode->i_sb, map.m_pblk, map.m_len, 0); fs/ext4/fast_commit.c: ext4_mb_mark_bb(inode->i_sb, map.m_pblk, map.m_len, 0); fs/ext4/fast_commit.c: ext4_mb_mark_bb(inode->i_sb, map.m_pblk, map.m_len, 0); fs/ext4/fast_commit.c: ext4_mb_mark_bb(inode->i_sb, fs/ext4/fast_commit.c: ext4_mb_mark_bb(inode->i_sb, map.m_pblk, fs/ext4/mballoc.c:void ext4_mb_mark_bb(struct super_block *sb, ext4_fsblk_t block, fs/ext4/mballoc.c: ext4_mb_mark_bb(sb, block, 1, 1); -ritesh
on 9/27/2023 2:10 PM, Ritesh Harjani wrote: > Kemeng Shi <shikemeng@huaweicloud.com> writes: > >> As state could only be either 0 or 1, just make it bool. > > Sure. > >> >> Signed-off-by: Kemeng Shi <shikemeng@huaweicloud.com> >> --- >> fs/ext4/ext4.h | 2 +- >> fs/ext4/fast_commit.c | 8 ++++---- >> fs/ext4/mballoc.c | 2 +- >> 3 files changed, 6 insertions(+), 6 deletions(-) > > But why not convert at all places? Sorry for this. Will convert at all places in next version. Thanks. > > git grep "ext4_mb_mark_bb" . > fs/ext4/ext4.h:extern void ext4_mb_mark_bb(struct super_block *sb, ext4_fsblk_t block, > fs/ext4/extents.c: ext4_mb_mark_bb(inode->i_sb, > fs/ext4/extents.c: ext4_mb_mark_bb(inode->i_sb, map.m_pblk, map.m_len, 0); > fs/ext4/fast_commit.c: ext4_mb_mark_bb(inode->i_sb, map.m_pblk, map.m_len, 0); > fs/ext4/fast_commit.c: ext4_mb_mark_bb(inode->i_sb, map.m_pblk, map.m_len, 0); > fs/ext4/fast_commit.c: ext4_mb_mark_bb(inode->i_sb, > fs/ext4/fast_commit.c: ext4_mb_mark_bb(inode->i_sb, map.m_pblk, > fs/ext4/mballoc.c:void ext4_mb_mark_bb(struct super_block *sb, ext4_fsblk_t block, > fs/ext4/mballoc.c: ext4_mb_mark_bb(sb, block, 1, 1); > > -ritesh >
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index 84618c46f239..88186ea2322f 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -2918,7 +2918,7 @@ extern int ext4_group_add_blocks(handle_t *handle, struct super_block *sb, extern int ext4_trim_fs(struct super_block *, struct fstrim_range *); extern void ext4_process_freed_data(struct super_block *sb, tid_t commit_tid); extern void ext4_mb_mark_bb(struct super_block *sb, ext4_fsblk_t block, - int len, int state); + int len, bool state); static inline bool ext4_mb_cr_expensive(enum criteria cr) { return cr >= CR_GOAL_LEN_SLOW; diff --git a/fs/ext4/fast_commit.c b/fs/ext4/fast_commit.c index b06de728b3b6..87c009e0c59a 100644 --- a/fs/ext4/fast_commit.c +++ b/fs/ext4/fast_commit.c @@ -1806,7 +1806,7 @@ static int ext4_fc_replay_add_range(struct super_block *sb, * at the end of the FC replay using our array of * modified inodes. */ - ext4_mb_mark_bb(inode->i_sb, map.m_pblk, map.m_len, 0); + ext4_mb_mark_bb(inode->i_sb, map.m_pblk, map.m_len, false); goto next; } @@ -1875,7 +1875,7 @@ ext4_fc_replay_del_range(struct super_block *sb, if (ret > 0) { remaining -= ret; cur += ret; - ext4_mb_mark_bb(inode->i_sb, map.m_pblk, map.m_len, 0); + ext4_mb_mark_bb(inode->i_sb, map.m_pblk, map.m_len, false); } else { remaining -= map.m_len; cur += map.m_len; @@ -1934,12 +1934,12 @@ static void ext4_fc_set_bitmaps_and_counters(struct super_block *sb) if (!IS_ERR(path)) { for (j = 0; j < path->p_depth; j++) ext4_mb_mark_bb(inode->i_sb, - path[j].p_block, 1, 1); + path[j].p_block, 1, true); ext4_free_ext_path(path); } cur += ret; ext4_mb_mark_bb(inode->i_sb, map.m_pblk, - map.m_len, 1); + map.m_len, true); } else { cur = cur + (map.m_len ? map.m_len : 1); } diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 1e599305d85f..cf09adfbaf11 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -4077,7 +4077,7 @@ ext4_mb_mark_diskspace_used(struct ext4_allocation_context *ac, * blocks in bitmaps and update counters. */ void ext4_mb_mark_bb(struct super_block *sb, ext4_fsblk_t block, - int len, int state) + int len, bool state) { struct buffer_head *bitmap_bh = NULL; struct ext4_group_desc *gdp;
As state could only be either 0 or 1, just make it bool. Signed-off-by: Kemeng Shi <shikemeng@huaweicloud.com> --- fs/ext4/ext4.h | 2 +- fs/ext4/fast_commit.c | 8 ++++---- fs/ext4/mballoc.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-)