diff options
author | Jiri Kosina <jkosina@suse.cz> | 2008-05-20 16:43:50 +0200 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2008-05-20 16:43:50 +0200 |
commit | 2d4b3f37ded8998a362c8d0b4be02f583dd9a002 (patch) | |
tree | 5c66ddaf0a6ab6d898931a5ed58c7aa844b94740 /fs/jbd/commit.c | |
parent | 7022b15e2a9f878fd5184586064c63352c3dd225 (diff) | |
parent | 8033c6e9736c29cce5f0d0abbca9a44dffb20c39 (diff) | |
download | kernel-crypto-2d4b3f37ded8998a362c8d0b4be02f583dd9a002.tar.gz kernel-crypto-2d4b3f37ded8998a362c8d0b4be02f583dd9a002.tar.xz kernel-crypto-2d4b3f37ded8998a362c8d0b4be02f583dd9a002.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/jbd/commit.c')
-rw-r--r-- | fs/jbd/commit.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/jbd/commit.c b/fs/jbd/commit.c index cd931ef1f00..5a8ca61498c 100644 --- a/fs/jbd/commit.c +++ b/fs/jbd/commit.c @@ -470,7 +470,9 @@ void 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); J_ASSERT(commit_transaction->t_nr_buffers <= commit_transaction->t_outstanding_credits); |