2020-01-23 07:02:03

by Shijie Luo

Subject: [PATCH v2] jbd2: remove pointless assertion in __journal_remove_journal_head

Only when jh->b_jcount = 0 in jbd2_journal_put_journal_head, we are allowed
to call __journal_remove_journal_head. This assertion is meaningless,
just remove it.

Signed-off-by: Shijie Luo <[email protected]>
Reviewed-by: Jan Kara <[email protected]>
---
fs/jbd2/journal.c | 1 -
1 file changed, 1 deletion(-)

diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
index 5e408ee24a1a..56510de63a3d 100644
--- a/fs/jbd2/journal.c
+++ b/fs/jbd2/journal.c
@@ -2556,7 +2556,6 @@ static void __journal_remove_journal_head(struct buffer_head *bh)
{
struct journal_head *jh = bh2jh(bh);

- J_ASSERT_JH(jh, jh->b_jcount >= 0);
J_ASSERT_JH(jh, jh->b_transaction == NULL);
J_ASSERT_JH(jh, jh->b_next_transaction == NULL);
J_ASSERT_JH(jh, jh->b_cp_transaction == NULL);
--
2.19.1

2020-01-25 07:29:05

by Theodore Ts'o

Subject: Re: [PATCH v2] jbd2: remove pointless assertion in __journal_remove_journal_head

On Thu, Jan 23, 2020 at 02:00:54AM -0500, Shijie Luo wrote:
> Only when jh->b_jcount = 0 in jbd2_journal_put_journal_head, we are allowed
> to call __journal_remove_journal_head. This assertion is meaningless,
> just remove it.
>
> Signed-off-by: Shijie Luo <[email protected]>
> Reviewed-by: Jan Kara <[email protected]>

Thanks, applied.

- Ted