提交 f882f126 编写于 作者: J Jan Kara 提交者: Yang Yingliang

jbd2: Drop unnecessary branch from jbd2_journal_forget()

mainline inclusion
from mainline-5.5-rc1
commit 6d69843e
category: bugfix
bugzilla: 176007
CVE: NA
---------------------------

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

Conflicts:
	fs/jbd2/transaction.c
Signed-off-by: Nyangerkun <yangerkun@huawei.com>
Reviewed-by: NZhang Yi <yi.zhang@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>
上级 a5c97756
...@@ -1639,10 +1639,6 @@ int jbd2_journal_forget (handle_t *handle, struct buffer_head *bh) ...@@ -1639,10 +1639,6 @@ int jbd2_journal_forget (handle_t *handle, struct buffer_head *bh)
__jbd2_journal_file_buffer(jh, transaction, BJ_Forget); __jbd2_journal_file_buffer(jh, transaction, BJ_Forget);
} else { } else {
__jbd2_journal_unfile_buffer(jh); __jbd2_journal_unfile_buffer(jh);
if (!buffer_jbd(bh)) {
spin_unlock(&journal->j_list_lock);
goto not_jbd;
}
} }
spin_unlock(&journal->j_list_lock); spin_unlock(&journal->j_list_lock);
} else if (jh->b_transaction) { } else if (jh->b_transaction) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册