diff options
author | Yongqiang Yang <xiaoqiangnk@gmail.com> | 2011-11-19 04:34:29 -0500 |
---|---|---|
committer | Jan Kara <jack@suse.cz> | 2011-11-21 19:20:53 -0500 |
commit | 8c111b3f56332a216b18cd57950bdf04ac8f2a98 (patch) | |
tree | 9295744be006082391c9bfeed2cabf43b29cc4ea /fs/jbd/commit.c | |
parent | 63894ab9f63a688f6b0b8cdd01ac0a9f36d507b8 (diff) |
jbd: clear revoked flag on buffers before a new transaction started
Currently, we clear revoked flag only when a block is reused. However,
this can tigger a false journal error. Consider a situation when a block
is used as a meta block and is deleted(revoked) in ordered mode, then the
block is allocated as a data block to a file. At this moment, user changes
the file's journal mode from ordered to journaled and truncates the file.
The block will be considered re-revoked by journal because it has revoked
flag still pending from the last transaction and an assertion triggers.
We fix the problem by keeping the revoked status more uptodate - we clear
revoked flag when switching revoke tables to reflect there is no revoked
buffers in current transaction any more.
Signed-off-by: Yongqiang Yang <xiaoqiangnk@gmail.com>
Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/jbd/commit.c')
-rw-r--r-- | fs/jbd/commit.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/fs/jbd/commit.c b/fs/jbd/commit.c index 8799207df058..f2b9a571f4cf 100644 --- a/fs/jbd/commit.c +++ b/fs/jbd/commit.c | |||
@@ -392,6 +392,12 @@ void journal_commit_transaction(journal_t *journal) | |||
392 | jbd_debug (3, "JBD: commit phase 1\n"); | 392 | jbd_debug (3, "JBD: commit phase 1\n"); |
393 | 393 | ||
394 | /* | 394 | /* |
395 | * Clear revoked flag to reflect there is no revoked buffers | ||
396 | * in the next transaction which is going to be started. | ||
397 | */ | ||
398 | journal_clear_buffer_revoked_flags(journal); | ||
399 | |||
400 | /* | ||
395 | * Switch to a new revoke table. | 401 | * Switch to a new revoke table. |
396 | */ | 402 | */ |
397 | journal_switch_revoke_table(journal); | 403 | journal_switch_revoke_table(journal); |