Unverified Commit 35332812 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!7595 jbd2: speed up jbd2_transaction_committed() 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zhang Yi <yi.zhang@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/K6YXBVFWYMJJRNW6RRTA2FDU42HZOBK3/ 
 
https://gitee.com/openeuler/kernel/issues/I9QSJ5 
 
Link:https://gitee.com/openeuler/kernel/pulls/7595

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents bb74bc36 d868d230

fs/jbd2/commit.c

+1 −1
Original line number Diff line number Diff line
@@ -1108,7 +1108,7 @@ void jbd2_journal_commit_transaction(journal_t *journal) 


	commit_transaction->t_state = T_COMMIT_CALLBACK;

	J_ASSERT(commit_transaction == journal->j_committing_transaction);

	journal->j_commit_sequence = commit_transaction->t_tid;

	WRITE_ONCE(journal->j_commit_sequence, commit_transaction->t_tid);

	journal->j_committing_transaction = NULL;

	commit_time = ktime_to_ns(ktime_sub(ktime_get(), start_time));

fs/jbd2/journal.c

+1 −11
Original line number Diff line number Diff line
@@ -789,17 +789,7 @@ EXPORT_SYMBOL(jbd2_fc_end_commit_fallback); 
/* Return 1 when transaction with given tid has already committed. */

int jbd2_transaction_committed(journal_t *journal, tid_t tid)

{

	int ret = 1;



	read_lock(&journal->j_state_lock);

	if (journal->j_running_transaction &&

	    journal->j_running_transaction->t_tid == tid)

		ret = 0;

	if (journal->j_committing_transaction &&

	    journal->j_committing_transaction->t_tid == tid)

		ret = 0;

	read_unlock(&journal->j_state_lock);

	return ret;

	return tid_geq(READ_ONCE(journal->j_commit_sequence), tid);

}

EXPORT_SYMBOL(jbd2_transaction_committed);