Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb0d9d47 authored by Jan Kara's avatar Jan Kara Committed by Theodore Ts'o
Browse files

jbd2: save some atomic ops in __JI_COMMIT_RUNNING handling 



Currently we used atomic bit operations to manipulate
__JI_COMMIT_RUNNING bit. However this is unnecessary as i_flags are
always written and read under j_list_lock. So just change the operations
to standard bit operations.

Signed-off-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent 1101cd4d

fs/jbd2/commit.c

+6 −6
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ static int journal_submit_data_buffers(journal_t *journal, 
	spin_lock(&journal->j_list_lock);

	list_for_each_entry(jinode, &commit_transaction->t_inode_list, i_list) {

		mapping = jinode->i_vfs_inode->i_mapping;

		set_bit(__JI_COMMIT_RUNNING, &jinode->i_flags);

		jinode->i_flags |= JI_COMMIT_RUNNING;

		spin_unlock(&journal->j_list_lock);

		/*

		 * submit the inode data buffers. We use writepage
@@ -234,8 +234,8 @@ static int journal_submit_data_buffers(journal_t *journal, 
			ret = err;

		spin_lock(&journal->j_list_lock);

		J_ASSERT(jinode->i_transaction == commit_transaction);

		clear_bit(__JI_COMMIT_RUNNING, &jinode->i_flags);

		smp_mb__after_atomic();

		jinode->i_flags &= ~JI_COMMIT_RUNNING;

		smp_mb();

		wake_up_bit(&jinode->i_flags, __JI_COMMIT_RUNNING);

	}

	spin_unlock(&journal->j_list_lock);
@@ -256,7 +256,7 @@ static int journal_finish_inode_data_buffers(journal_t *journal, 
	/* For locking, see the comment in journal_submit_data_buffers() */

	spin_lock(&journal->j_list_lock);

	list_for_each_entry(jinode, &commit_transaction->t_inode_list, i_list) {

		set_bit(__JI_COMMIT_RUNNING, &jinode->i_flags);

		jinode->i_flags |= JI_COMMIT_RUNNING;

		spin_unlock(&journal->j_list_lock);

		err = filemap_fdatawait(jinode->i_vfs_inode->i_mapping);

		if (err) {
@@ -272,8 +272,8 @@ static int journal_finish_inode_data_buffers(journal_t *journal, 
				ret = err;

		}

		spin_lock(&journal->j_list_lock);

		clear_bit(__JI_COMMIT_RUNNING, &jinode->i_flags);

		smp_mb__after_atomic();

		jinode->i_flags &= ~JI_COMMIT_RUNNING;

		smp_mb();

		wake_up_bit(&jinode->i_flags, __JI_COMMIT_RUNNING);

	}

fs/jbd2/journal.c

+1 −1
Original line number Diff line number Diff line
@@ -2587,7 +2587,7 @@ void jbd2_journal_release_jbd_inode(journal_t *journal, 
restart:

	spin_lock(&journal->j_list_lock);

	/* Is commit writing out inode - we have to wait */

	if (test_bit(__JI_COMMIT_RUNNING, &jinode->i_flags)) {

	if (jinode->i_flags & JI_COMMIT_RUNNING) {

		wait_queue_head_t *wq;

		DEFINE_WAIT_BIT(wait, &jinode->i_flags, __JI_COMMIT_RUNNING);

		wq = bit_waitqueue(&jinode->i_flags, __JI_COMMIT_RUNNING);