From: Jan Kara <jack@suse.cz>
Date: Fri, 9 Aug 2019 12:42:30 +0000 (+0200)
Subject: jbd2: Drop unnecessary branch from jbd2_journal_forget()
X-Git-Tag: v5.15~4836^2~26
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6d69843e5d3f0c394e1e3004cc2b36efbe402b71;p=platform%2Fkernel%2Flinux-starfive.git

jbd2: Drop unnecessary branch from jbd2_journal_forget()

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>
Link: https://lore.kernel.org/r/20190809124233.13277-5-jack@suse.cz
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
---

diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c
index 6201130..2d42bc42 100644
--- a/fs/jbd2/transaction.c
+++ b/fs/jbd2/transaction.c
@@ -1599,10 +1599,6 @@ int jbd2_journal_forget (handle_t *handle, struct buffer_head *bh)
 		} 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) {