Merge branch 'bkl/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic...

[karo-tx-linux.git] / fs / jbd2 / commit.c

diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c
index 75716d3d2be0351fde4a5953360a5a0c2774f4ae..f52e5e8049f195ec461bfb8781584722b5da2562 100644 (file)
--- a/fs/jbd2/commit.c
+++ b/fs/jbd2/commit.c
@@ -150,11 +150,11 @@ static int journal_submit_commit_record(journal_t *journal,
         */
        if (ret == -EOPNOTSUPP && barrier_done) {
                printk(KERN_WARNING
-                      "JBD: barrier-based sync failed on %s - "
-                      "disabling barriers\n", journal->j_devname);
-               spin_lock(&journal->j_state_lock);
+                      "JBD2: Disabling barriers on %s, "
+                      "not supported by device\n", journal->j_devname);
+               write_lock(&journal->j_state_lock);
                journal->j_flags &= ~JBD2_BARRIER;
-               spin_unlock(&journal->j_state_lock);
+               write_unlock(&journal->j_state_lock);
 
                /* And try again, without the barrier */
                lock_buffer(bh);
@@ -180,11 +180,11 @@ retry:
        wait_on_buffer(bh);
        if (buffer_eopnotsupp(bh) && (journal->j_flags & JBD2_BARRIER)) {
                printk(KERN_WARNING
-                      "JBD2: wait_on_commit_record: sync failed on %s - "
-                      "disabling barriers\n", journal->j_devname);
-               spin_lock(&journal->j_state_lock);
+                      "JBD2: %s: disabling barries on %s - not supported "
+                      "by device\n", __func__, journal->j_devname);
+               write_lock(&journal->j_state_lock);
                journal->j_flags &= ~JBD2_BARRIER;
-               spin_unlock(&journal->j_state_lock);
+               write_unlock(&journal->j_state_lock);
 
                lock_buffer(bh);
                clear_buffer_dirty(bh);
@@ -400,7 +400,7 @@ void jbd2_journal_commit_transaction(journal_t *journal)
        jbd_debug(1, "JBD: starting commit of transaction %d\n",
                        commit_transaction->t_tid);
 
-       spin_lock(&journal->j_state_lock);
+       write_lock(&journal->j_state_lock);
        commit_transaction->t_state = T_LOCKED;
 
        /*
@@ -417,23 +417,23 @@ void jbd2_journal_commit_transaction(journal_t *journal)
                                              stats.run.rs_locked);
 
        spin_lock(&commit_transaction->t_handle_lock);
-       while (commit_transaction->t_updates) {
+       while (atomic_read(&commit_transaction->t_updates)) {
                DEFINE_WAIT(wait);
 
                prepare_to_wait(&journal->j_wait_updates, &wait,
                                        TASK_UNINTERRUPTIBLE);
-               if (commit_transaction->t_updates) {
+               if (atomic_read(&commit_transaction->t_updates)) {
                        spin_unlock(&commit_transaction->t_handle_lock);
-                       spin_unlock(&journal->j_state_lock);
+                       write_unlock(&journal->j_state_lock);
                        schedule();
-                       spin_lock(&journal->j_state_lock);
+                       write_lock(&journal->j_state_lock);
                        spin_lock(&commit_transaction->t_handle_lock);
                }
                finish_wait(&journal->j_wait_updates, &wait);
        }
        spin_unlock(&commit_transaction->t_handle_lock);
 
-       J_ASSERT (commit_transaction->t_outstanding_credits <=
+       J_ASSERT (atomic_read(&commit_transaction->t_outstanding_credits) <=
                        journal->j_max_transaction_buffers);
 
        /*
@@ -497,7 +497,7 @@ void jbd2_journal_commit_transaction(journal_t *journal)
        start_time = ktime_get();
        commit_transaction->t_log_start = journal->j_head;
        wake_up(&journal->j_wait_transaction_locked);
-       spin_unlock(&journal->j_state_lock);
+       write_unlock(&journal->j_state_lock);
 
        jbd_debug (3, "JBD: commit phase 2\n");
 
@@ -519,19 +519,20 @@ 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);
+       write_lock(&journal->j_state_lock);
        commit_transaction->t_state = T_COMMIT;
-       spin_unlock(&journal->j_state_lock);
+       write_unlock(&journal->j_state_lock);
 
        trace_jbd2_commit_logging(journal, commit_transaction);
        stats.run.rs_logging = jiffies;
        stats.run.rs_flushing = jbd2_time_diff(stats.run.rs_flushing,
                                               stats.run.rs_logging);
-       stats.run.rs_blocks = commit_transaction->t_outstanding_credits;
+       stats.run.rs_blocks =
+               atomic_read(&commit_transaction->t_outstanding_credits);
        stats.run.rs_blocks_logged = 0;
 
        J_ASSERT(commit_transaction->t_nr_buffers <=
-                commit_transaction->t_outstanding_credits);
+                atomic_read(&commit_transaction->t_outstanding_credits));
 
        err = 0;
        descriptor = NULL;
@@ -616,7 +617,7 @@ void jbd2_journal_commit_transaction(journal_t *journal)
                 * the free space in the log, but this counter is changed
                 * by jbd2_journal_next_log_block() also.
                 */
-               commit_transaction->t_outstanding_credits--;
+               atomic_dec(&commit_transaction->t_outstanding_credits);
 
                /* Bump b_count to prevent truncate from stumbling over
                    the shadowed buffer!  @@@ This can go if we ever get
@@ -977,7 +978,7 @@ restart_loop:
         * __jbd2_journal_drop_transaction(). Otherwise we could race with
         * other checkpointing code processing the transaction...
         */
-       spin_lock(&journal->j_state_lock);
+       write_lock(&journal->j_state_lock);
        spin_lock(&journal->j_list_lock);
        /*
         * Now recheck if some buffers did not get attached to the transaction
@@ -985,7 +986,7 @@ restart_loop:
         */
        if (commit_transaction->t_forget) {
                spin_unlock(&journal->j_list_lock);
-               spin_unlock(&journal->j_state_lock);
+               write_unlock(&journal->j_state_lock);
                goto restart_loop;
        }
 
@@ -1003,7 +1004,8 @@ restart_loop:
         * File the transaction statistics
         */
        stats.ts_tid = commit_transaction->t_tid;
-       stats.run.rs_handle_count = commit_transaction->t_handle_count;
+       stats.run.rs_handle_count =
+               atomic_read(&commit_transaction->t_handle_count);
        trace_jbd2_run_stats(journal->j_fs_dev->bd_dev,
                             commit_transaction->t_tid, &stats.run);
 
@@ -1037,7 +1039,7 @@ restart_loop:
                                journal->j_average_commit_time*3) / 4;
        else
                journal->j_average_commit_time = commit_time;
-       spin_unlock(&journal->j_state_lock);
+       write_unlock(&journal->j_state_lock);
 
        if (commit_transaction->t_checkpoint_list == NULL &&
            commit_transaction->t_checkpoint_io_list == NULL) {