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

ext4: dedpulicate the code to wait on inode that's being committed 



This patch removes the deduplicates the code that implements waiting
on inode that's being committed. That code is moved into a new
function.

Suggested-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarHarshad Shirwadkar <harshadshirwadkar@gmail.com>
Link: https://lore.kernel.org/r/20201106035911.1942128-14-harshadshirwadkar@gmail.com


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

fs/ext4/fast_commit.c

+27 −34
Original line number Diff line number Diff line
@@ -155,6 +155,30 @@ void ext4_fc_init_inode(struct inode *inode) 
	ei->i_fc_committed_subtid = 0;

}



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

static void ext4_fc_wait_committing_inode(struct inode *inode)

{

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

}



/*

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

 *
@@ -176,22 +200,7 @@ void ext4_fc_start_update(struct inode *inode) 
		goto out;



	if (ext4_test_inode_state(inode, EXT4_STATE_FC_COMMITTING)) {

		wait_queue_head_t *wq;

#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

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

		ext4_fc_wait_committing_inode(inode);

		goto restart;

	}

out:
@@ -234,25 +243,9 @@ void ext4_fc_del(struct inode *inode) 
	}



	if (ext4_test_inode_state(inode, EXT4_STATE_FC_COMMITTING)) {

		wait_queue_head_t *wq;

#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

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

		ext4_fc_wait_committing_inode(inode);

		goto restart;

	}

	if (!list_empty(&ei->i_fc_list))

	list_del_init(&ei->i_fc_list);

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

}