diff options
author | Theodore Ts'o <tytso@mit.edu> | 2012-01-10 11:54:07 -0500 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2012-01-10 11:54:07 -0500 |
commit | ff9cb1c4eead5e4c292e75cd3170a82d66944101 (patch) | |
tree | cdb132a39e550a9b7b28ea67544cb86cd6ebdb6e /fs/jbd2/commit.c | |
parent | e4e11180dfa545233e5145919b75b7fac88638df (diff) | |
parent | d50f2ab6f050311dbf7b8f5501b25f0bf64a439b (diff) |
Merge branch 'for_linus' into for_linus_merged
Conflicts:
fs/ext4/ioctl.c
Diffstat (limited to 'fs/jbd2/commit.c')
-rw-r--r-- | fs/jbd2/commit.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c index 68d704db787f..5069b8475150 100644 --- a/fs/jbd2/commit.c +++ b/fs/jbd2/commit.c | |||
@@ -430,6 +430,12 @@ void jbd2_journal_commit_transaction(journal_t *journal) | |||
430 | jbd_debug(3, "JBD2: commit phase 1\n"); | 430 | jbd_debug(3, "JBD2: commit phase 1\n"); |
431 | 431 | ||
432 | /* | 432 | /* |
433 | * Clear revoked flag to reflect there is no revoked buffers | ||
434 | * in the next transaction which is going to be started. | ||
435 | */ | ||
436 | jbd2_clear_buffer_revoked_flags(journal); | ||
437 | |||
438 | /* | ||
433 | * Switch to a new revoke table. | 439 | * Switch to a new revoke table. |
434 | */ | 440 | */ |
435 | jbd2_journal_switch_revoke_table(journal); | 441 | jbd2_journal_switch_revoke_table(journal); |