2010-01-25 04:12:38

by Ding Dinghua

Subject: [PATCH 0/2]fix an assertion in jbd/jbd2

the patch set is build on linus-git tree.
Two small fixs in journal_commit_transaction, jbd2_journal_commit_transaction

dingdinghua (2):
Jbd: fix an assertion, jh->b_transaction should be
Jbd2: fix an assertion, jh->b_transaction should be

fs/jbd/commit.c | 3 +--
fs/jbd2/commit.c | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)

2010-01-25 04:12:40

by Ding Dinghua

Subject: [PATCH 1/2] Jbd: fix an assertion, jh->b_transaction should be

---
fs/jbd/commit.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/fs/jbd/commit.c b/fs/jbd/commit.c
index 4bd8825..ddd9efa 100644
--- a/fs/jbd/commit.c
+++ b/fs/jbd/commit.c
@@ -821,8 +821,7 @@ restart_loop:
spin_unlock(&journal->j_list_lock);
bh = jh2bh(jh);
jbd_lock_bh_state(bh);
- J_ASSERT_JH(jh, jh->b_transaction == commit_transaction ||
- jh->b_transaction == journal->j_running_transaction);
+ J_ASSERT_JH(jh, jh->b_transaction == commit_transaction);

/*
* If there is undo-protected committed data against
--
1.5.5.6

2010-01-25 04:12:41

by Ding Dinghua

Subject: [PATCH 2/2] Jbd2: fix an assertion, jh->b_transaction should be

---
fs/jbd2/commit.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c
index 1bc74b6..28ad981 100644
--- a/fs/jbd2/commit.c
+++ b/fs/jbd2/commit.c
@@ -883,8 +883,7 @@ restart_loop:
spin_unlock(&journal->j_list_lock);
bh = jh2bh(jh);
jbd_lock_bh_state(bh);
- J_ASSERT_JH(jh, jh->b_transaction == commit_transaction ||
- jh->b_transaction == journal->j_running_transaction);
+ J_ASSERT_JH(jh, jh->b_transaction == commit_transaction);

/*
* If there is undo-protected committed data against
--
1.5.5.6

2010-02-24 17:12:17

by Theodore Ts'o

Subject: Re: [PATCH 1/2] Jbd: fix an assertion, jh->b_transaction should be

On Mon, Jan 25, 2010 at 11:45:03AM +0800, dingdinghua wrote:
> ---
> fs/jbd/commit.c | 3 +--
> 1 files changed, 1 insertions(+), 2 deletions(-)
>

I've changed the commit message to read:

jbd2: clean up an assertion in jbd2_journal_commit_transaction()

commit_transaction has the same value as journal->j_running_transaction,
so we can simplify the assert statement.

This is a pretty simple patch, but I wanted to give you credit, so I
assumed that you had meant to add a Signed-off-by: line but just
forgot. Please let me know if this was not your intention!

- Ted

2010-02-24 17:13:07

by Theodore Ts'o

Subject: Re: [PATCH 1/2] Jbd: fix an assertion, jh->b_transaction should be

On Mon, Jan 25, 2010 at 11:45:03AM +0800, dingdinghua wrote:
> ---
> fs/jbd/commit.c | 3 +--
> 1 files changed, 1 insertions(+), 2 deletions(-)

Acked-by: "Theodore Ts'o" <[email protected]>

(Sorry, I replied to the wrong mail message in my previous note; I've
put the jbd2 version of this patch in the ext4 patch queue, and I'm
acking this for Jan.)

- Ted

2010-02-25 01:11:13

by Ding Dinghua

Subject: Re: [PATCH 1/2] Jbd: fix an assertion, jh->b_transaction should be

Thanks a lot. I forgot the comment and the sign-off issue.

2010/2/25 <[email protected]>:
> On Mon, Jan 25, 2010 at 11:45:03AM +0800, dingdinghua wrote:
>> ---
>> fs/jbd/commit.c | 3 +--
>> 1 files changed, 1 insertions(+), 2 deletions(-)
>>
>
> I've changed the commit message to read:
>
> jbd2: clean up an assertion in jbd2_journal_commit_transaction()
>
> commit_transaction has the same value as journal->j_running_transaction,
> so we can simplify the assert statement.
>
> This is a pretty simple patch, but I wanted to give you credit, so I
> assumed that you had meant to add a Signed-off-by: line but just
> forgot. Please let me know if this was not your intention!
>
> - Ted
> --
> To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>



--
??????