diff options
Diffstat (limited to 'fs/reiserfs/journal.c')
-rw-r--r-- | fs/reiserfs/journal.c | 13 |
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 { | |||
678 | static void write_chunk(struct buffer_chunk *chunk) | 678 | static void write_chunk(struct buffer_chunk *chunk) |
679 | { | 679 | { |
680 | int i; | 680 | int i; |
681 | get_fs_excl(); | ||
682 | for (i = 0; i < chunk->nr; i++) { | 681 | for (i = 0; i < chunk->nr; i++) { |
683 | submit_logged_buffer(chunk->bh[i]); | 682 | submit_logged_buffer(chunk->bh[i]); |
684 | } | 683 | } |
685 | chunk->nr = 0; | 684 | chunk->nr = 0; |
686 | put_fs_excl(); | ||
687 | } | 685 | } |
688 | 686 | ||
689 | static void write_ordered_chunk(struct buffer_chunk *chunk) | 687 | static void write_ordered_chunk(struct buffer_chunk *chunk) |
690 | { | 688 | { |
691 | int i; | 689 | int i; |
692 | get_fs_excl(); | ||
693 | for (i = 0; i < chunk->nr; i++) { | 690 | for (i = 0; i < chunk->nr; i++) { |
694 | submit_ordered_buffer(chunk->bh[i]); | 691 | submit_ordered_buffer(chunk->bh[i]); |
695 | } | 692 | } |
696 | chunk->nr = 0; | 693 | chunk->nr = 0; |
697 | put_fs_excl(); | ||
698 | } | 694 | } |
699 | 695 | ||
700 | static int add_to_chunk(struct buffer_chunk *chunk, struct buffer_head *bh, | 696 | 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, | |||
986 | return 0; | 982 | return 0; |
987 | } | 983 | } |
988 | 984 | ||
989 | get_fs_excl(); | ||
990 | |||
991 | /* before we can put our commit blocks on disk, we have to make sure everyone older than | 985 | /* before we can put our commit blocks on disk, we have to make sure everyone older than |
992 | ** us is on disk too | 986 | ** us is on disk too |
993 | */ | 987 | */ |
@@ -1145,7 +1139,6 @@ static int flush_commit_list(struct super_block *s, | |||
1145 | if (retval) | 1139 | if (retval) |
1146 | reiserfs_abort(s, retval, "Journal write error in %s", | 1140 | reiserfs_abort(s, retval, "Journal write error in %s", |
1147 | __func__); | 1141 | __func__); |
1148 | put_fs_excl(); | ||
1149 | return retval; | 1142 | return retval; |
1150 | } | 1143 | } |
1151 | 1144 | ||
@@ -1374,8 +1367,6 @@ static int flush_journal_list(struct super_block *s, | |||
1374 | return 0; | 1367 | return 0; |
1375 | } | 1368 | } |
1376 | 1369 | ||
1377 | get_fs_excl(); | ||
1378 | |||
1379 | /* if all the work is already done, get out of here */ | 1370 | /* if all the work is already done, get out of here */ |
1380 | if (atomic_read(&(jl->j_nonzerolen)) <= 0 && | 1371 | if (atomic_read(&(jl->j_nonzerolen)) <= 0 && |
1381 | atomic_read(&(jl->j_commit_left)) <= 0) { | 1372 | atomic_read(&(jl->j_commit_left)) <= 0) { |
@@ -1597,7 +1588,6 @@ static int flush_journal_list(struct super_block *s, | |||
1597 | put_journal_list(s, jl); | 1588 | put_journal_list(s, jl); |
1598 | if (flushall) | 1589 | if (flushall) |
1599 | mutex_unlock(&journal->j_flush_mutex); | 1590 | mutex_unlock(&journal->j_flush_mutex); |
1600 | put_fs_excl(); | ||
1601 | return err; | 1591 | return err; |
1602 | } | 1592 | } |
1603 | 1593 | ||
@@ -3108,7 +3098,6 @@ static int do_journal_begin_r(struct reiserfs_transaction_handle *th, | |||
3108 | th->t_trans_id = journal->j_trans_id; | 3098 | th->t_trans_id = journal->j_trans_id; |
3109 | unlock_journal(sb); | 3099 | unlock_journal(sb); |
3110 | INIT_LIST_HEAD(&th->t_list); | 3100 | INIT_LIST_HEAD(&th->t_list); |
3111 | get_fs_excl(); | ||
3112 | return 0; | 3101 | return 0; |
3113 | 3102 | ||
3114 | out_fail: | 3103 | out_fail: |
@@ -3964,7 +3953,6 @@ static int do_journal_end(struct reiserfs_transaction_handle *th, | |||
3964 | flush = flags & FLUSH_ALL; | 3953 | flush = flags & FLUSH_ALL; |
3965 | wait_on_commit = flags & WAIT; | 3954 | wait_on_commit = flags & WAIT; |
3966 | 3955 | ||
3967 | put_fs_excl(); | ||
3968 | current->journal_info = th->t_handle_save; | 3956 | current->journal_info = th->t_handle_save; |
3969 | reiserfs_check_lock_depth(sb, "journal end"); | 3957 | reiserfs_check_lock_depth(sb, "journal end"); |
3970 | if (journal->j_len == 0) { | 3958 | if (journal->j_len == 0) { |
@@ -4316,4 +4304,3 @@ void reiserfs_abort_journal(struct super_block *sb, int errno) | |||
4316 | dump_stack(); | 4304 | dump_stack(); |
4317 | #endif | 4305 | #endif |
4318 | } | 4306 | } |
4319 | |||