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

Commit 21ea616f authored by Andrew Perepechko's avatar Andrew Perepechko Committed by Greg Kroah-Hartman
Browse files

jbd2: wake up journal waiters in FIFO order, not LIFO 



commit 34fc8768ec6089565d6d73bad26724083cecf7bd upstream.

LIFO wakeup order is unfair and sometimes leads to a journal
user not being able to get a journal handle for hundreds of
transactions in a row.

FIFO wakeup can make things more fair.

Cc: stable@kernel.org
Signed-off-by: default avatarAlexey Lyashkov <alexey.lyashkov@gmail.com>
Reviewed-by: default avatarRitesh Harjani (IBM) <ritesh.list@gmail.com>
Link: https://lore.kernel.org/r/20220907165959.1137482-1-alexey.lyashkov@gmail.com


Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d1c2d820

fs/jbd2/commit.c

+1 −1
Original line number Diff line number Diff line
@@ -531,7 +531,7 @@ void jbd2_journal_commit_transaction(journal_t *journal) 
	journal->j_running_transaction = NULL;

	start_time = ktime_get();

	commit_transaction->t_log_start = journal->j_head;

	wake_up(&journal->j_wait_transaction_locked);

	wake_up_all(&journal->j_wait_transaction_locked);

	write_unlock(&journal->j_state_lock);



	jbd_debug(3, "JBD2: commit phase 2a\n");

fs/jbd2/transaction.c

+3 −3
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ static void wait_transaction_locked(journal_t *journal) 
	int need_to_start;

	tid_t tid = journal->j_running_transaction->t_tid;



	prepare_to_wait(&journal->j_wait_transaction_locked, &wait,

	prepare_to_wait_exclusive(&journal->j_wait_transaction_locked, &wait,

			TASK_UNINTERRUPTIBLE);

	need_to_start = !tid_geq(journal->j_commit_request, tid);

	read_unlock(&journal->j_state_lock);
@@ -175,7 +175,7 @@ static void wait_transaction_switching(journal_t *journal) 
		read_unlock(&journal->j_state_lock);

		return;

	}

	prepare_to_wait(&journal->j_wait_transaction_locked, &wait,

	prepare_to_wait_exclusive(&journal->j_wait_transaction_locked, &wait,

			TASK_UNINTERRUPTIBLE);

	read_unlock(&journal->j_state_lock);

	/*
@@ -810,7 +810,7 @@ void jbd2_journal_unlock_updates (journal_t *journal) 
	write_lock(&journal->j_state_lock);

	--journal->j_barrier_count;

	write_unlock(&journal->j_state_lock);

	wake_up(&journal->j_wait_transaction_locked);

	wake_up_all(&journal->j_wait_transaction_locked);

}



static void warn_dirty_buffer(struct buffer_head *bh)