path: root/fs/jbd2/commit.c
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2008-05-15 18:28:28 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-05-15 18:28:28 -0700
commitac0e9c30b1cb22c01f3edbb94857de2bae7611ca (patch)
tree9d9c8f381b86f473ac36db3602faea64d05dbaba /fs/jbd2/commit.c
parenta76bfd0da2321ed0a978ccbef192856ce7ed687a (diff)
parent02c471cb17203c748e9bc87003052c1f46e5df69 (diff)
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: jbd2: update transaction t_state to T_COMMIT fix ext4: Retry block allocation if new blocks are allocated from system zone. ext4: mballoc fix mb_normalize_request algorithm for 1KB block size filesystems ext4: fix typos in messages and comments (journalled -> journaled) ext4: fix synchronization of quota files in journal=data mode ext4: Fix mount messages when quota disabled ext4: correct mount option parsing to detect when quota options can be changed
Diffstat (limited to 'fs/jbd2/commit.c')
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c
index e0139786f717..4d99685fdce4 100644
--- a/fs/jbd2/commit.c
+++ b/fs/jbd2/commit.c
@@ -560,7 +560,9 @@ void jbd2_journal_commit_transaction(journal_t *journal)
* transaction! Now comes the tricky part: we need to write out
* metadata. Loop over the transaction's entire buffer list:
+ spin_lock(&journal->j_state_lock);
commit_transaction->t_state = T_COMMIT;
+ spin_unlock(&journal->j_state_lock);
stats.u.run.rs_logging = jiffies;
stats.u.run.rs_flushing = jbd2_time_diff(stats.u.run.rs_flushing,