Merge branch 'for-3.1/core' of git://git.kernel.dk/linux-block

* 'for-3.1/core' of git://git.kernel.dk/linux-block: (24 commits)
  block: strict rq_affinity
  backing-dev: use synchronize_rcu_expedited instead of synchronize_rcu
  block: fix patch import error in max_discard_sectors check
  block: reorder request_queue to remove 64 bit alignment padding
  CFQ: add think time check for group
  CFQ: add think time check for service tree
  CFQ: move think time check variables to a separate struct
  fixlet: Remove fs_excl from struct task.
  cfq: Remove special treatment for metadata rqs.
  block: document blk_plug list access
  block: avoid building too big plug list
  compat_ioctl: fix make headers_check regression
  block: eliminate potential for infinite loop in blkdev_issue_discard
  compat_ioctl: fix warning caused by qemu
  block: flush MEDIA_CHANGE from drivers on close(2)
  blk-throttle: Make total_nr_queued unsigned
  block: Add __attribute__((format(printf...) and fix fallout
  fs/partitions/check.c: make local symbols static
  block:remove some spare spaces in genhd.c
  block:fix the comment error in blkdev.h
  ...

1 files changed, 0 insertions, 13 deletions

diff --git a/fs/reiserfs/journal.c b/fs/reiserfs/journal.c
index c5e82ece7c6c..a159ba5a35e7 100644
--- a/fs/reiserfs/journal.c
+++ b/fs/reiserfs/journal.c
@@ -678,23 +678,19 @@ struct buffer_chunk {
 static void write_chunk(struct buffer_chunk *chunk)
 {
         int i;
-        get_fs_excl();
         for (i = 0; i < chunk->nr; i++) {
                 submit_logged_buffer(chunk->bh[i]);
         }
         chunk->nr = 0;
-        put_fs_excl();
 }
 
 static void write_ordered_chunk(struct buffer_chunk *chunk)
 {
         int i;
-        get_fs_excl();
         for (i = 0; i < chunk->nr; i++) {
                 submit_ordered_buffer(chunk->bh[i]);
         }
         chunk->nr = 0;
-        put_fs_excl();
 }
 
 static int add_to_chunk(struct buffer_chunk *chunk, struct buffer_head *bh,
@@ -986,8 +982,6 @@ static int flush_commit_list(struct super_block *s,
                 return 0;
         }
 
-        get_fs_excl();
-
         /* before we can put our commit blocks on disk, we have to make sure everyone older than
          ** us is on disk too
          */
@@ -1145,7 +1139,6 @@ static int flush_commit_list(struct super_block *s,
         if (retval)
                 reiserfs_abort(s, retval, "Journal write error in %s",
                                __func__);
-        put_fs_excl();
         return retval;
 }
 
@@ -1374,8 +1367,6 @@ static int flush_journal_list(struct super_block *s,
                 return 0;
         }
 
-        get_fs_excl();
-
         /* if all the work is already done, get out of here */
         if (atomic_read(&(jl->j_nonzerolen)) <= 0 &&
             atomic_read(&(jl->j_commit_left)) <= 0) {
@@ -1597,7 +1588,6 @@ static int flush_journal_list(struct super_block *s,
         put_journal_list(s, jl);
         if (flushall)
                 mutex_unlock(&journal->j_flush_mutex);
-        put_fs_excl();
         return err;
 }
 
@@ -3108,7 +3098,6 @@ static int do_journal_begin_r(struct reiserfs_transaction_handle *th,
         th->t_trans_id = journal->j_trans_id;
         unlock_journal(sb);
         INIT_LIST_HEAD(&th->t_list);
-        get_fs_excl();
         return 0;
 
       out_fail:
@@ -3964,7 +3953,6 @@ static int do_journal_end(struct reiserfs_transaction_handle *th,
         flush = flags & FLUSH_ALL;
         wait_on_commit = flags & WAIT;
 
-        put_fs_excl();
         current->journal_info = th->t_handle_save;
         reiserfs_check_lock_depth(sb, "journal end");
         if (journal->j_len == 0) {
@@ -4316,4 +4304,3 @@ void reiserfs_abort_journal(struct super_block *sb, int errno)
         dump_stack();
 #endif
 }
-