diff options
Diffstat (limited to 'debian/patches-rt/0004-jbd2-Drop-unnecessary-branch-from-jbd2_journal_forge.patch')
| -rw-r--r-- | debian/patches-rt/0004-jbd2-Drop-unnecessary-branch-from-jbd2_journal_forge.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/debian/patches-rt/0004-jbd2-Drop-unnecessary-branch-from-jbd2_journal_forge.patch b/debian/patches-rt/0004-jbd2-Drop-unnecessary-branch-from-jbd2_journal_forge.patch new file mode 100644 index 000000000..fb5f3bc4a --- /dev/null +++ b/debian/patches-rt/0004-jbd2-Drop-unnecessary-branch-from-jbd2_journal_forge.patch @@ -0,0 +1,28 @@ +From: Jan Kara <jack@suse.cz> +Date: Fri, 9 Aug 2019 14:42:30 +0200 +Subject: [PATCH 4/7] jbd2: Drop unnecessary branch from jbd2_journal_forget() +Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/5.4/older/patches-5.4.3-rt1.tar.xz + +We have cleared both dirty & jbddirty bits from the bh. So there's no +difference between bforget() and brelse(). Thus there's no point jumping +to no_jbd branch. + +Signed-off-by: Jan Kara <jack@suse.cz> +Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> +--- + fs/jbd2/transaction.c | 4 ---- + 1 file changed, 4 deletions(-) + +--- a/fs/jbd2/transaction.c ++++ b/fs/jbd2/transaction.c +@@ -1599,10 +1599,6 @@ int jbd2_journal_forget (handle_t *handl + } else { + __jbd2_journal_unfile_buffer(jh); + jbd2_journal_put_journal_head(jh); +- if (!buffer_jbd(bh)) { +- spin_unlock(&journal->j_list_lock); +- goto not_jbd; +- } + } + spin_unlock(&journal->j_list_lock); + } else if (jh->b_transaction) { |