aboutsummaryrefslogtreecommitdiffstats
path: root/fs/reiserfs/journal.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/reiserfs/journal.c')
-rw-r--r--fs/reiserfs/journal.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/reiserfs/journal.c b/fs/reiserfs/journal.c
index 69ff280bdfe8..70057359fbaf 100644
--- a/fs/reiserfs/journal.c
+++ b/fs/reiserfs/journal.c
@@ -1960,7 +1960,7 @@ static int do_journal_release(struct reiserfs_transaction_handle *th,
1960 /* 1960 /*
1961 * Cancel flushing of old commits. Note that neither of these works 1961 * Cancel flushing of old commits. Note that neither of these works
1962 * will be requeued because superblock is being shutdown and doesn't 1962 * will be requeued because superblock is being shutdown and doesn't
1963 * have MS_ACTIVE set. 1963 * have SB_ACTIVE set.
1964 */ 1964 */
1965 reiserfs_cancel_old_flush(sb); 1965 reiserfs_cancel_old_flush(sb);
1966 /* wait for all commits to finish */ 1966 /* wait for all commits to finish */
@@ -4302,7 +4302,7 @@ static int do_journal_end(struct reiserfs_transaction_handle *th, int flags)
4302 * Avoid queueing work when sb is being shut down. Transaction 4302 * Avoid queueing work when sb is being shut down. Transaction
4303 * will be flushed on journal shutdown. 4303 * will be flushed on journal shutdown.
4304 */ 4304 */
4305 if (sb->s_flags & MS_ACTIVE) 4305 if (sb->s_flags & SB_ACTIVE)
4306 queue_delayed_work(REISERFS_SB(sb)->commit_wq, 4306 queue_delayed_work(REISERFS_SB(sb)->commit_wq,
4307 &journal->j_work, HZ / 10); 4307 &journal->j_work, HZ / 10);
4308 } 4308 }
@@ -4393,7 +4393,7 @@ void reiserfs_abort_journal(struct super_block *sb, int errno)
4393 if (!journal->j_errno) 4393 if (!journal->j_errno)
4394 journal->j_errno = errno; 4394 journal->j_errno = errno;
4395 4395
4396 sb->s_flags |= MS_RDONLY; 4396 sb->s_flags |= SB_RDONLY;
4397 set_bit(J_ABORTED, &journal->j_state); 4397 set_bit(J_ABORTED, &journal->j_state);
4398 4398
4399#ifdef CONFIG_REISERFS_CHECK 4399#ifdef CONFIG_REISERFS_CHECK