diff options
| author | Jeff Mahoney <jeffm@suse.com> | 2014-04-23 10:00:39 -0400 |
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2014-05-06 23:10:37 +0200 |
| commit | 09f1b80ba8c967b6e17c0516e95578d5da18115f (patch) | |
| tree | 73292ba9941be885d1d7d0652a20a5dd2a2964ca /fs/reiserfs/journal.c | |
| parent | 58d854265c4c7d9792ecb5aa5ef67ba79b1a4c12 (diff) | |
| download | linux-09f1b80ba8c967b6e17c0516e95578d5da18115f.tar.bz2 | |
reiserfs: cleanup, remove sb argument from journal_mark_dirty
journal_mark_dirty doesn't need a separate sb argument; It's provided
by the transaction handle.
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: Jan Kara <jack@suse.cz>
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, reiserfs_prepare_for_journal(sb, SB_BUFFER_WITH_SB(sb), 1); - journal_mark_dirty(&myth, sb, - SB_BUFFER_WITH_SB(sb)); + journal_mark_dirty(&myth, SB_BUFFER_WITH_SB(sb)); do_journal_end(&myth, FLUSH_ALL); flushed = 1; } @@ -1943,8 +1942,7 @@ static int do_journal_release(struct reiserfs_transaction_handle *th, reiserfs_prepare_for_journal(sb, SB_BUFFER_WITH_SB(sb), 1); - journal_mark_dirty(&myth, sb, - SB_BUFFER_WITH_SB(sb)); + journal_mark_dirty(&myth, SB_BUFFER_WITH_SB(sb)); do_journal_end(&myth, FLUSH_ALL); } } @@ -3268,8 +3266,9 @@ int journal_begin(struct reiserfs_transaction_handle *th, * if j_len, is bigger than j_len_alloc, it pushes j_len_alloc to 10 + j_len. */ int journal_mark_dirty(struct reiserfs_transaction_handle *th, - struct super_block *sb, struct buffer_head *bh) + struct buffer_head *bh) { + struct super_block *sb = th->t_super; struct reiserfs_journal *journal = SB_JOURNAL(sb); struct reiserfs_journal_cnode *cn = NULL; int count_already_incd = 0; @@ -3522,7 +3521,7 @@ int journal_end_sync(struct reiserfs_transaction_handle *th) if (journal->j_len == 0) { reiserfs_prepare_for_journal(sb, SB_BUFFER_WITH_SB(sb), 1); - journal_mark_dirty(th, sb, SB_BUFFER_WITH_SB(sb)); + journal_mark_dirty(th, SB_BUFFER_WITH_SB(sb)); } return do_journal_end(th, COMMIT_NOW | WAIT); } @@ -3576,8 +3575,7 @@ void reiserfs_flush_old_commits(struct super_block *sb) reiserfs_prepare_for_journal(sb, SB_BUFFER_WITH_SB(sb), 1); - journal_mark_dirty(&th, sb, - SB_BUFFER_WITH_SB(sb)); + journal_mark_dirty(&th, SB_BUFFER_WITH_SB(sb)); /* * we're only being called from kreiserfsd, it makes @@ -3863,7 +3861,7 @@ static int __commit_trans_jl(struct inode *inode, unsigned long id, if (journal->j_trans_id != id) { reiserfs_prepare_for_journal(sb, SB_BUFFER_WITH_SB(sb), 1); - journal_mark_dirty(&th, sb, SB_BUFFER_WITH_SB(sb)); + journal_mark_dirty(&th, SB_BUFFER_WITH_SB(sb)); ret = journal_end(&th); goto flush_commit_only; } @@ -4014,7 +4012,7 @@ static int do_journal_end(struct reiserfs_transaction_handle *th, int flags) if (journal->j_len == 0) { reiserfs_prepare_for_journal(sb, SB_BUFFER_WITH_SB(sb), 1); - journal_mark_dirty(th, sb, SB_BUFFER_WITH_SB(sb)); + journal_mark_dirty(th, SB_BUFFER_WITH_SB(sb)); } lock_journal(sb); |