← Back to branch summary

~ubuntu-branches/ubuntu/lucid/linux-rt/lucid

« back to all changes in this revision

Viewing changes to fs/jbd/commit.c

  • Committer: Bazaar Package Importer
  • Author(s): Luke Yelavich
  • Date: 2009-07-11 13:31:31 UTC
  • mfrom: (14.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20090711133131-omdhleccno39rayr
Tags: 2.6.29.6-1.1
New upstream kernel and RT patchset release

Show diffs side-by-side

added added

removed removed

Lines of Context:
fs/jbd/commit.c
238
238
                        spin_lock(&journal->j_list_lock);
239
239
                }
240
240
                /* Someone already cleaned up the buffer? */
241
 
                if (!buffer_jbd(bh)
 
241
                if (!buffer_jbd(bh) || bh2jh(bh) != jh
242
242
                        || jh->b_transaction != commit_transaction
243
243
                        || jh->b_jlist != BJ_SyncData) {
244
244
                        jbd_unlock_bh_state(bh);
466
466
                        spin_lock(&journal->j_list_lock);
467
467
                        continue;
468
468
                }
469
 
                if (buffer_jbd(bh) && jh->b_jlist == BJ_Locked) {
 
469
                if (buffer_jbd(bh) && bh2jh(bh) == jh &&
 
470
                    jh->b_transaction == commit_transaction &&
 
471
                    jh->b_jlist == BJ_Locked) {
470
472
                        __journal_unfile_buffer(jh);
471
473
                        jbd_unlock_bh_state(bh);
472
474
                        journal_remove_journal_head(bh);