aboutsummaryrefslogtreecommitdiffstats
path: root/fs/jbd2/commit.c
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2012-01-13 23:59:13 -0600
committerSteve French <sfrench@us.ibm.com>2012-01-13 23:59:13 -0600
commitdcd169b761d52e3f9122e30442b83863bdf1d9d9 (patch)
tree5e79741f1865a3aef840e68d7db9e7ed4d685b5a /fs/jbd2/commit.c
parentMerge branch 'master' of git+ssh://git.samba.org/data/git/sfrench/cifs-2.6 (diff)
parentcifs: integer overflow in parse_dacl() (diff)
downloadlinux-rng-dcd169b761d52e3f9122e30442b83863bdf1d9d9.tar.xz
linux-rng-dcd169b761d52e3f9122e30442b83863bdf1d9d9.zip
Merge branch 'master' of git+ssh://git.samba.org/data/git/sfrench/cifs-2.6
Diffstat (limited to 'fs/jbd2/commit.c')
-rw-r--r--fs/jbd2/commit.c6
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)
jbd_debug(3, "JBD2: commit phase 1\n");
/*
+ * Clear revoked flag to reflect there is no revoked buffers
+ * in the next transaction which is going to be started.
+ */
+ jbd2_clear_buffer_revoked_flags(journal);
+
+ /*
* Switch to a new revoke table.
*/
jbd2_journal_switch_revoke_table(journal);