diff options
Diffstat (limited to 'fs/reiserfs/journal.c')
-rw-r--r-- | fs/reiserfs/journal.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/fs/reiserfs/journal.c b/fs/reiserfs/journal.c index 5b4ccd5f642e..688c7d2f0fc5 100644 --- a/fs/reiserfs/journal.c +++ b/fs/reiserfs/journal.c | |||
@@ -1929,8 +1929,7 @@ static int do_journal_release(struct reiserfs_transaction_handle *th, | |||
1929 | reiserfs_prepare_for_journal(sb, | 1929 | reiserfs_prepare_for_journal(sb, |
1930 | SB_BUFFER_WITH_SB(sb), | 1930 | SB_BUFFER_WITH_SB(sb), |
1931 | 1); | 1931 | 1); |
1932 | journal_mark_dirty(&myth, sb, | 1932 | journal_mark_dirty(&myth, SB_BUFFER_WITH_SB(sb)); |
1933 | SB_BUFFER_WITH_SB(sb)); | ||
1934 | do_journal_end(&myth, FLUSH_ALL); | 1933 | do_journal_end(&myth, FLUSH_ALL); |
1935 | flushed = 1; | 1934 | flushed = 1; |
1936 | } | 1935 | } |
@@ -1943,8 +1942,7 @@ static int do_journal_release(struct reiserfs_transaction_handle *th, | |||
1943 | reiserfs_prepare_for_journal(sb, | 1942 | reiserfs_prepare_for_journal(sb, |
1944 | SB_BUFFER_WITH_SB(sb), | 1943 | SB_BUFFER_WITH_SB(sb), |
1945 | 1); | 1944 | 1); |
1946 | journal_mark_dirty(&myth, sb, | 1945 | journal_mark_dirty(&myth, SB_BUFFER_WITH_SB(sb)); |
1947 | SB_BUFFER_WITH_SB(sb)); | ||
1948 | do_journal_end(&myth, FLUSH_ALL); | 1946 | do_journal_end(&myth, FLUSH_ALL); |
1949 | } | 1947 | } |
1950 | } | 1948 | } |
@@ -3268,8 +3266,9 @@ int journal_begin(struct reiserfs_transaction_handle *th, | |||
3268 | * if j_len, is bigger than j_len_alloc, it pushes j_len_alloc to 10 + j_len. | 3266 | * if j_len, is bigger than j_len_alloc, it pushes j_len_alloc to 10 + j_len. |
3269 | */ | 3267 | */ |
3270 | int journal_mark_dirty(struct reiserfs_transaction_handle *th, | 3268 | int journal_mark_dirty(struct reiserfs_transaction_handle *th, |
3271 | struct super_block *sb, struct buffer_head *bh) | 3269 | struct buffer_head *bh) |
3272 | { | 3270 | { |
3271 | struct super_block *sb = th->t_super; | ||
3273 | struct reiserfs_journal *journal = SB_JOURNAL(sb); | 3272 | struct reiserfs_journal *journal = SB_JOURNAL(sb); |
3274 | struct reiserfs_journal_cnode *cn = NULL; | 3273 | struct reiserfs_journal_cnode *cn = NULL; |
3275 | int count_already_incd = 0; | 3274 | int count_already_incd = 0; |
@@ -3522,7 +3521,7 @@ int journal_end_sync(struct reiserfs_transaction_handle *th) | |||
3522 | if (journal->j_len == 0) { | 3521 | if (journal->j_len == 0) { |
3523 | reiserfs_prepare_for_journal(sb, SB_BUFFER_WITH_SB(sb), | 3522 | reiserfs_prepare_for_journal(sb, SB_BUFFER_WITH_SB(sb), |
3524 | 1); | 3523 | 1); |
3525 | journal_mark_dirty(th, sb, SB_BUFFER_WITH_SB(sb)); | 3524 | journal_mark_dirty(th, SB_BUFFER_WITH_SB(sb)); |
3526 | } | 3525 | } |
3527 | return do_journal_end(th, COMMIT_NOW | WAIT); | 3526 | return do_journal_end(th, COMMIT_NOW | WAIT); |
3528 | } | 3527 | } |
@@ -3576,8 +3575,7 @@ void reiserfs_flush_old_commits(struct super_block *sb) | |||
3576 | reiserfs_prepare_for_journal(sb, | 3575 | reiserfs_prepare_for_journal(sb, |
3577 | SB_BUFFER_WITH_SB(sb), | 3576 | SB_BUFFER_WITH_SB(sb), |
3578 | 1); | 3577 | 1); |
3579 | journal_mark_dirty(&th, sb, | 3578 | journal_mark_dirty(&th, SB_BUFFER_WITH_SB(sb)); |
3580 | SB_BUFFER_WITH_SB(sb)); | ||
3581 | 3579 | ||
3582 | /* | 3580 | /* |
3583 | * we're only being called from kreiserfsd, it makes | 3581 | * we're only being called from kreiserfsd, it makes |
@@ -3863,7 +3861,7 @@ static int __commit_trans_jl(struct inode *inode, unsigned long id, | |||
3863 | if (journal->j_trans_id != id) { | 3861 | if (journal->j_trans_id != id) { |
3864 | reiserfs_prepare_for_journal(sb, SB_BUFFER_WITH_SB(sb), | 3862 | reiserfs_prepare_for_journal(sb, SB_BUFFER_WITH_SB(sb), |
3865 | 1); | 3863 | 1); |
3866 | journal_mark_dirty(&th, sb, SB_BUFFER_WITH_SB(sb)); | 3864 | journal_mark_dirty(&th, SB_BUFFER_WITH_SB(sb)); |
3867 | ret = journal_end(&th); | 3865 | ret = journal_end(&th); |
3868 | goto flush_commit_only; | 3866 | goto flush_commit_only; |
3869 | } | 3867 | } |
@@ -4014,7 +4012,7 @@ static int do_journal_end(struct reiserfs_transaction_handle *th, int flags) | |||
4014 | if (journal->j_len == 0) { | 4012 | if (journal->j_len == 0) { |
4015 | reiserfs_prepare_for_journal(sb, SB_BUFFER_WITH_SB(sb), | 4013 | reiserfs_prepare_for_journal(sb, SB_BUFFER_WITH_SB(sb), |
4016 | 1); | 4014 | 1); |
4017 | journal_mark_dirty(th, sb, SB_BUFFER_WITH_SB(sb)); | 4015 | journal_mark_dirty(th, SB_BUFFER_WITH_SB(sb)); |
4018 | } | 4016 | } |
4019 | 4017 | ||
4020 | lock_journal(sb); | 4018 | lock_journal(sb); |