diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2008-05-06 16:57:55 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2008-05-06 16:57:55 +0200 |
| commit | 7022b15e2a9f878fd5184586064c63352c3dd225 (patch) | |
| tree | 5365c2f5bc82ae1946636ee8d5cd5d3b7e804f1b /fs/jbd/commit.c | |
| parent | aaad2b0c757f3e6e02552cb0bdcd91a5ec0d6305 (diff) | |
| parent | a15306365a16380f3bafee9e181ba01231d4acd7 (diff) | |
| download | kernel-crypto-7022b15e2a9f878fd5184586064c63352c3dd225.tar.gz kernel-crypto-7022b15e2a9f878fd5184586064c63352c3dd225.tar.xz kernel-crypto-7022b15e2a9f878fd5184586064c63352c3dd225.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 | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/fs/jbd/commit.c b/fs/jbd/commit.c index a38c7186c57..cd931ef1f00 100644 --- a/fs/jbd/commit.c +++ b/fs/jbd/commit.c @@ -407,22 +407,6 @@ void journal_commit_transaction(journal_t *journal) jbd_debug (3, "JBD: commit phase 2\n"); /* - * First, drop modified flag: all accesses to the buffers - * will be tracked for a new trasaction only -bzzz - */ - spin_lock(&journal->j_list_lock); - if (commit_transaction->t_buffers) { - new_jh = jh = commit_transaction->t_buffers->b_tnext; - do { - J_ASSERT_JH(new_jh, new_jh->b_modified == 1 || - new_jh->b_modified == 0); - new_jh->b_modified = 0; - new_jh = new_jh->b_tnext; - } while (new_jh != jh); - } - spin_unlock(&journal->j_list_lock); - - /* * Now start flushing things to disk, in the order they appear * on the transaction lists. Data blocks go first. */ @@ -488,6 +472,9 @@ void journal_commit_transaction(journal_t *journal) */ commit_transaction->t_state = T_COMMIT; + J_ASSERT(commit_transaction->t_nr_buffers <= + commit_transaction->t_outstanding_credits); + descriptor = NULL; bufs = 0; while (commit_transaction->t_buffers) { |