Commit f7314a67 authored by Jason Yan's avatar Jason Yan Committed by Theodore Ts'o
Browse files

ext4: factor out ext4_fast_commit_init() 



Factor out ext4_fast_commit_init(). No functional change.

Signed-off-by: default avatarJason Yan <yanaijie@huawei.com>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Reviewed-by: default avatarRitesh Harjani (IBM) <ritesh.list@gmail.com>
Link: https://lore.kernel.org/r/20220916141527.1012715-6-yanaijie@huawei.com


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

fs/ext4/super.c

+25 −18
Original line number Diff line number Diff line
@@ -4395,6 +4395,30 @@ static int ext4_handle_clustersize(struct super_block *sb, int blocksize) 
	return 0;

}



static void ext4_fast_commit_init(struct super_block *sb)

{

	struct ext4_sb_info *sbi = EXT4_SB(sb);



	/* Initialize fast commit stuff */

	atomic_set(&sbi->s_fc_subtid, 0);

	INIT_LIST_HEAD(&sbi->s_fc_q[FC_Q_MAIN]);

	INIT_LIST_HEAD(&sbi->s_fc_q[FC_Q_STAGING]);

	INIT_LIST_HEAD(&sbi->s_fc_dentry_q[FC_Q_MAIN]);

	INIT_LIST_HEAD(&sbi->s_fc_dentry_q[FC_Q_STAGING]);

	sbi->s_fc_bytes = 0;

	ext4_clear_mount_flag(sb, EXT4_MF_FC_INELIGIBLE);

	sbi->s_fc_ineligible_tid = 0;

	spin_lock_init(&sbi->s_fc_lock);

	memset(&sbi->s_fc_stats, 0, sizeof(sbi->s_fc_stats));

	sbi->s_fc_replay_state.fc_regions = NULL;

	sbi->s_fc_replay_state.fc_regions_size = 0;

	sbi->s_fc_replay_state.fc_regions_used = 0;

	sbi->s_fc_replay_state.fc_regions_valid = 0;

	sbi->s_fc_replay_state.fc_modified_inodes = NULL;

	sbi->s_fc_replay_state.fc_modified_inodes_size = 0;

	sbi->s_fc_replay_state.fc_modified_inodes_used = 0;

}



static int __ext4_fill_super(struct fs_context *fc, struct super_block *sb)

{

	struct buffer_head *bh, **group_desc;
@@ -5033,24 +5057,7 @@ static int __ext4_fill_super(struct fs_context *fc, struct super_block *sb) 
	INIT_LIST_HEAD(&sbi->s_orphan); /* unlinked but open files */

	mutex_init(&sbi->s_orphan_lock);



	/* Initialize fast commit stuff */

	atomic_set(&sbi->s_fc_subtid, 0);

	INIT_LIST_HEAD(&sbi->s_fc_q[FC_Q_MAIN]);

	INIT_LIST_HEAD(&sbi->s_fc_q[FC_Q_STAGING]);

	INIT_LIST_HEAD(&sbi->s_fc_dentry_q[FC_Q_MAIN]);

	INIT_LIST_HEAD(&sbi->s_fc_dentry_q[FC_Q_STAGING]);

	sbi->s_fc_bytes = 0;

	ext4_clear_mount_flag(sb, EXT4_MF_FC_INELIGIBLE);

	sbi->s_fc_ineligible_tid = 0;

	spin_lock_init(&sbi->s_fc_lock);

	memset(&sbi->s_fc_stats, 0, sizeof(sbi->s_fc_stats));

	sbi->s_fc_replay_state.fc_regions = NULL;

	sbi->s_fc_replay_state.fc_regions_size = 0;

	sbi->s_fc_replay_state.fc_regions_used = 0;

	sbi->s_fc_replay_state.fc_regions_valid = 0;

	sbi->s_fc_replay_state.fc_modified_inodes = NULL;

	sbi->s_fc_replay_state.fc_modified_inodes_size = 0;

	sbi->s_fc_replay_state.fc_modified_inodes_used = 0;

	ext4_fast_commit_init(sb);



	sb->s_root = NULL;