mirror of
https://github.com/torvalds/linux.git
synced 2026-04-18 14:53:58 -04:00
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: Harshad Shirwadkar <harshadshirwadkar@gmail.com> Reviewed-by: Jan Kara <jack@suse.cz> Link: https://patch.msgid.link/20250508175908.1004880-6-harshadshirwadkar@gmail.com Signed-off-by: Theodore Ts'o <tytso@mit.edu>
This commit is contained in:
committed by
Theodore Ts'o
parent
857d32f261
commit
ed45d33113
@@ -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.
|
||||
|
||||
Reference in New Issue
Block a user