Commit d2f7cf40 authored by Kemeng Shi's avatar Kemeng Shi Committed by Theodore Ts'o
Browse files

ext4: make state in ext4_mb_mark_bb to be bool 



As state could only be either 0 or 1, just make it bool.

Signed-off-by: default avatarKemeng Shi <shikemeng@huaweicloud.com>
Reviewed-by: default avatar"Ritesh Harjani (IBM)" <ritesh.list@gmail.com>
Link: https://lore.kernel.org/r/20230928160407.142069-2-shikemeng@huaweicloud.com


Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent 61187fce

fs/ext4/ext4.h

+1 −1
Original line number Diff line number Diff line
@@ -2926,7 +2926,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;

fs/ext4/extents.c

+2 −2
Original line number Diff line number Diff line
@@ -6080,13 +6080,13 @@ int ext4_ext_clear_bb(struct inode *inode) 
				for (j = 0; j < path->p_depth; j++) {



					ext4_mb_mark_bb(inode->i_sb,

							path[j].p_block, 1, 0);

							path[j].p_block, 1, false);

					ext4_fc_record_regions(inode->i_sb, inode->i_ino,

							0, path[j].p_block, 1, 1);

				}

				ext4_free_ext_path(path);

			}

			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);

			ext4_fc_record_regions(inode->i_sb, inode->i_ino,

					map.m_lblk, map.m_pblk, map.m_len, 1);

		}

fs/ext4/fast_commit.c

+4 −4
Original line number Diff line number Diff line
@@ -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);

			}

fs/ext4/mballoc.c

+2 −2
Original line number Diff line number Diff line
@@ -4067,7 +4067,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;
@@ -6095,7 +6095,7 @@ ext4_mb_new_blocks_simple(struct ext4_allocation_request *ar, int *errp) 
	}



	block = ext4_group_first_block_no(sb, group) + EXT4_C2B(sbi, i);

	ext4_mb_mark_bb(sb, block, 1, 1);

	ext4_mb_mark_bb(sb, block, 1, true);

	ar->len = 1;



	return block;