Commit ed45d331 authored by Harshad Shirwadkar's avatar Harshad Shirwadkar Committed by Theodore Ts'o
Browse files

ext4: drop i_fc_updates from inode fc info 



The new logic introduced in this series does not require tracking number
of active handles open on an inode. So, drop it.

Signed-off-by: default avatarHarshad Shirwadkar <harshadshirwadkar@gmail.com>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Link: https://patch.msgid.link/20250508175908.1004880-6-harshadshirwadkar@gmail.com


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

fs/ext4/ext4.h

+0 −5
Original line number Diff line number Diff line
@@ -1061,9 +1061,6 @@ struct ext4_inode_info { 
	/* End of lblk range that needs to be committed in this fast commit */

	ext4_lblk_t i_fc_lblk_len;



	/* Number of ongoing updates on this inode */

	atomic_t  i_fc_updates;



	spinlock_t i_raw_lock;	/* protects updates to the raw inode */



	/* Fast commit wait queue for this inode */
@@ -2926,8 +2923,6 @@ void __ext4_fc_track_create(handle_t *handle, struct inode *inode, 
void ext4_fc_track_create(handle_t *handle, struct dentry *dentry);

void ext4_fc_track_inode(handle_t *handle, struct inode *inode);

void ext4_fc_mark_ineligible(struct super_block *sb, int reason, handle_t *handle);

void ext4_fc_start_update(struct inode *inode);

void ext4_fc_stop_update(struct inode *inode);

void ext4_fc_del(struct inode *inode);

bool ext4_fc_replay_check_excluded(struct super_block *sb, ext4_fsblk_t block);

void ext4_fc_replay_cleanup(struct super_block *sb);

fs/ext4/fast_commit.c

+0 −68
Original line number Diff line number Diff line
@@ -202,32 +202,6 @@ void ext4_fc_init_inode(struct inode *inode) 
	INIT_LIST_HEAD(&ei->i_fc_list);

	INIT_LIST_HEAD(&ei->i_fc_dilist);

	init_waitqueue_head(&ei->i_fc_wait);

	atomic_set(&ei->i_fc_updates, 0);

}



/* This function must be called with sbi->s_fc_lock held. */

static void ext4_fc_wait_committing_inode(struct inode *inode)

__releases(&EXT4_SB(inode->i_sb)->s_fc_lock)

{

	wait_queue_head_t *wq;

	struct ext4_inode_info *ei = EXT4_I(inode);



#if (BITS_PER_LONG < 64)

	DEFINE_WAIT_BIT(wait, &ei->i_state_flags,

			EXT4_STATE_FC_COMMITTING);

	wq = bit_waitqueue(&ei->i_state_flags,

				EXT4_STATE_FC_COMMITTING);

#else

	DEFINE_WAIT_BIT(wait, &ei->i_flags,

			EXT4_STATE_FC_COMMITTING);

	wq = bit_waitqueue(&ei->i_flags,

				EXT4_STATE_FC_COMMITTING);

#endif

	lockdep_assert_held(&EXT4_SB(inode->i_sb)->s_fc_lock);

	prepare_to_wait(wq, &wait.wq_entry, TASK_UNINTERRUPTIBLE);

	spin_unlock(&EXT4_SB(inode->i_sb)->s_fc_lock);

	schedule();

	finish_wait(wq, &wait.wq_entry);

}



static bool ext4_fc_disabled(struct super_block *sb)
@@ -236,48 +210,6 @@ static bool ext4_fc_disabled(struct super_block *sb) 
		(EXT4_SB(sb)->s_mount_state & EXT4_FC_REPLAY));

}



/*

 * Inform Ext4's fast about start of an inode update

 *

 * This function is called by the high level call VFS callbacks before

 * performing any inode update. This function blocks if there's an ongoing

 * fast commit on the inode in question.

 */

void ext4_fc_start_update(struct inode *inode)

{

	struct ext4_inode_info *ei = EXT4_I(inode);



	if (ext4_fc_disabled(inode->i_sb))

		return;



restart:

	spin_lock(&EXT4_SB(inode->i_sb)->s_fc_lock);

	if (list_empty(&ei->i_fc_list))

		goto out;



	if (ext4_test_inode_state(inode, EXT4_STATE_FC_COMMITTING)) {

		ext4_fc_wait_committing_inode(inode);

		goto restart;

	}

out:

	atomic_inc(&ei->i_fc_updates);

	spin_unlock(&EXT4_SB(inode->i_sb)->s_fc_lock);

}



/*

 * Stop inode update and wake up waiting fast commits if any.

 */

void ext4_fc_stop_update(struct inode *inode)

{

	struct ext4_inode_info *ei = EXT4_I(inode);



	if (ext4_fc_disabled(inode->i_sb))

		return;



	if (atomic_dec_and_test(&ei->i_fc_updates))

		wake_up_all(&ei->i_fc_wait);

}



/*

 * Remove inode from fast commit list. If the inode is being committed

 * we wait until inode commit is done.