diff options
Diffstat (limited to 'fs/jbd')
-rw-r--r-- | fs/jbd/commit.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/jbd/commit.c b/fs/jbd/commit.c index 06560c520f49..618e21c0b7a3 100644 --- a/fs/jbd/commit.c +++ b/fs/jbd/commit.c | |||
@@ -241,7 +241,7 @@ write_out_data: | |||
241 | spin_lock(&journal->j_list_lock); | 241 | spin_lock(&journal->j_list_lock); |
242 | } | 242 | } |
243 | /* Someone already cleaned up the buffer? */ | 243 | /* Someone already cleaned up the buffer? */ |
244 | if (!buffer_jbd(bh) | 244 | if (!buffer_jbd(bh) || bh2jh(bh) != jh |
245 | || jh->b_transaction != commit_transaction | 245 | || jh->b_transaction != commit_transaction |
246 | || jh->b_jlist != BJ_SyncData) { | 246 | || jh->b_jlist != BJ_SyncData) { |
247 | jbd_unlock_bh_state(bh); | 247 | jbd_unlock_bh_state(bh); |
@@ -478,7 +478,9 @@ void journal_commit_transaction(journal_t *journal) | |||
478 | spin_lock(&journal->j_list_lock); | 478 | spin_lock(&journal->j_list_lock); |
479 | continue; | 479 | continue; |
480 | } | 480 | } |
481 | if (buffer_jbd(bh) && jh->b_jlist == BJ_Locked) { | 481 | if (buffer_jbd(bh) && bh2jh(bh) == jh && |
482 | jh->b_transaction == commit_transaction && | ||
483 | jh->b_jlist == BJ_Locked) { | ||
482 | __journal_unfile_buffer(jh); | 484 | __journal_unfile_buffer(jh); |
483 | jbd_unlock_bh_state(bh); | 485 | jbd_unlock_bh_state(bh); |
484 | journal_remove_journal_head(bh); | 486 | journal_remove_journal_head(bh); |