diff options
| author | Jeff Mahoney <jeffm@suse.com> | 2008-07-25 10:46:38 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-25 19:53:33 +0200 |
| commit | f68215c4640a38d66429014e524a627bf572d26a (patch) | |
| tree | 9880a7adbdcda5dba88fe875520b787555b80802 /fs/reiserfs/journal.c | |
| parent | reiserfs: correct mount option parsing to detect when quota options can be ch... (diff) | |
| download | linux-f68215c4640a38d66429014e524a627bf572d26a.tar.xz linux-f68215c4640a38d66429014e524a627bf572d26a.zip | |
reiserfs: convert j_lock to mutex
j_lock is a semaphore but uses it as if it were a mutex. This patch converts
it to a mutex.
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Cc: Matthew Wilcox <matthew@wil.cx>
Cc: Chris Mason <chris.mason@oracle.com>
Cc: Edward Shishkin <edward.shishkin@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/reiserfs/journal.c')
| -rw-r--r-- | fs/reiserfs/journal.c | 6 |
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, static inline void lock_journal(struct super_block *p_s_sb) { PROC_INFO_INC(p_s_sb, journal.lock_journal); - down(&SB_JOURNAL(p_s_sb)->j_lock); + mutex_lock(&SB_JOURNAL(p_s_sb)->j_mutex); } /* unlock the current transaction */ static inline void unlock_journal(struct super_block *p_s_sb) { - up(&SB_JOURNAL(p_s_sb)->j_lock); + mutex_unlock(&SB_JOURNAL(p_s_sb)->j_mutex); } static 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, journal->j_last = NULL; journal->j_first = NULL; init_waitqueue_head(&(journal->j_join_wait)); - sema_init(&journal->j_lock, 1); + mutex_init(&journal->j_mutex); sema_init(&journal->j_flush_sem, 1); journal->j_trans_id = 10; |