aboutsummaryrefslogtreecommitdiffstats
path: root/fs/reiserfs
diff options
context:
space:
mode:
Diffstat (limited to 'fs/reiserfs')
-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 e396b2fa4743..0f7b1e807e60 100644
--- a/fs/reiserfs/journal.c
+++ b/fs/reiserfs/journal.c
@@ -558,13 +558,13 @@ static inline void insert_journal_hash(struct reiserfs_journal_cnode **table,
558static inline void lock_journal(struct super_block *p_s_sb) 558static inline void lock_journal(struct super_block *p_s_sb)
559{ 559{
560 PROC_INFO_INC(p_s_sb, journal.lock_journal); 560 PROC_INFO_INC(p_s_sb, journal.lock_journal);
561 down(&SB_JOURNAL(p_s_sb)->j_lock); 561 mutex_lock(&SB_JOURNAL(p_s_sb)->j_mutex);
562} 562}
563 563
564/* unlock the current transaction */ 564/* unlock the current transaction */
565static inline void unlock_journal(struct super_block *p_s_sb) 565static inline void unlock_journal(struct super_block *p_s_sb)
566{ 566{
567 up(&SB_JOURNAL(p_s_sb)->j_lock); 567 mutex_unlock(&SB_JOURNAL(p_s_sb)->j_mutex);
568} 568}
569 569
570static inline void get_journal_list(struct reiserfs_journal_list *jl) 570static inline void get_journal_list(struct reiserfs_journal_list *jl)
@@ -2837,7 +2837,7 @@ int journal_init(struct super_block *p_s_sb, const char *j_dev_name,
2837 journal->j_last = NULL; 2837 journal->j_last = NULL;
2838 journal->j_first = NULL; 2838 journal->j_first = NULL;
2839 init_waitqueue_head(&(journal->j_join_wait)); 2839 init_waitqueue_head(&(journal->j_join_wait));
2840 sema_init(&journal->j_lock, 1); 2840 mutex_init(&journal->j_mutex);
2841 sema_init(&journal->j_flush_sem, 1); 2841 sema_init(&journal->j_flush_sem, 1);
2842 2842
2843 journal->j_trans_id = 10; 2843 journal->j_trans_id = 10;