diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-08 05:43:49 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-08 05:43:49 -0400 |
commit | 1d6ae775d7a948c9575658eb41184fd2e506c0df (patch) | |
tree | 8128a28e89d82f13bb8e3a2160382240c66e2816 /fs/reiserfs | |
parent | 739cdbf1d8f0739b80035b80d69d871e33749b86 (diff) | |
parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'fs/reiserfs')
-rw-r--r-- | fs/reiserfs/journal.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/reiserfs/journal.c b/fs/reiserfs/journal.c index ca7989b04be3..a8e29e9bbbd0 100644 --- a/fs/reiserfs/journal.c +++ b/fs/reiserfs/journal.c | |||
@@ -1034,7 +1034,7 @@ static int flush_commit_list(struct super_block *s, | |||
1034 | SB_ONDISK_JOURNAL_SIZE(s); | 1034 | SB_ONDISK_JOURNAL_SIZE(s); |
1035 | tbh = journal_find_get_block(s, bn); | 1035 | tbh = journal_find_get_block(s, bn); |
1036 | if (buffer_dirty(tbh)) /* redundant, ll_rw_block() checks */ | 1036 | if (buffer_dirty(tbh)) /* redundant, ll_rw_block() checks */ |
1037 | ll_rw_block(WRITE, 1, &tbh); | 1037 | ll_rw_block(SWRITE, 1, &tbh); |
1038 | put_bh(tbh); | 1038 | put_bh(tbh); |
1039 | } | 1039 | } |
1040 | atomic_dec(&journal->j_async_throttle); | 1040 | atomic_dec(&journal->j_async_throttle); |
@@ -2172,7 +2172,7 @@ static int journal_read_transaction(struct super_block *p_s_sb, | |||
2172 | /* flush out the real blocks */ | 2172 | /* flush out the real blocks */ |
2173 | for (i = 0; i < get_desc_trans_len(desc); i++) { | 2173 | for (i = 0; i < get_desc_trans_len(desc); i++) { |
2174 | set_buffer_dirty(real_blocks[i]); | 2174 | set_buffer_dirty(real_blocks[i]); |
2175 | ll_rw_block(WRITE, 1, real_blocks + i); | 2175 | ll_rw_block(SWRITE, 1, real_blocks + i); |
2176 | } | 2176 | } |
2177 | for (i = 0; i < get_desc_trans_len(desc); i++) { | 2177 | for (i = 0; i < get_desc_trans_len(desc); i++) { |
2178 | wait_on_buffer(real_blocks[i]); | 2178 | wait_on_buffer(real_blocks[i]); |