iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reiserfs: convert j_flush_sem to mutex

Browse Source 
j_flush_sem is a semaphore but uses it as if it were a mutex.  This patch
converts it to a mutex.

[akpm@linux-foundation.org: fix mutex_trylock retval treatment]
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>
This commit is contained in:
Jeff Mahoney 2008-07-25 01:46:39 -07:00 committed by Linus Torvalds
parent f68215c464
commit afe7025907
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fs/reiserfs/journal.c
View File

@ -1411,8 +1411,8 @@ static int flush_journal_list(struct super_block *s,
/* if flushall == 0, the lock is already held */ /* if flushall == 0, the lock is already held */
if (flushall) { if (flushall) {
down(&journal->j_flush_sem); mutex_lock(&journal->j_flush_mutex);
} else if (!down_trylock(&journal->j_flush_sem)) { } else if (mutex_trylock(&journal->j_flush_mutex)) {
BUG(); BUG();
} }
@ -1642,7 +1642,7 @@ static int flush_journal_list(struct super_block *s,
jl->j_state = 0; jl->j_state = 0;
put_journal_list(s, jl); put_journal_list(s, jl);
if (flushall) if (flushall)
up(&journal->j_flush_sem); mutex_unlock(&journal->j_flush_mutex);
put_fs_excl(); put_fs_excl();
return err; return err;
} }
@ -1772,12 +1772,12 @@ static int kupdate_transactions(struct super_block *s,
struct reiserfs_journal *journal = SB_JOURNAL(s); struct reiserfs_journal *journal = SB_JOURNAL(s);
chunk.nr = 0; chunk.nr = 0;
down(&journal->j_flush_sem); mutex_lock(&journal->j_flush_mutex);
if (!journal_list_still_alive(s, orig_trans_id)) { if (!journal_list_still_alive(s, orig_trans_id)) {
goto done; goto done;
} }
/* we've got j_flush_sem held, nobody is going to delete any /* we've got j_flush_mutex held, nobody is going to delete any
* of these lists out from underneath us * of these lists out from underneath us
*/ */
while ((num_trans && transactions_flushed < num_trans) || while ((num_trans && transactions_flushed < num_trans) ||
@ -1812,7 +1812,7 @@ static int kupdate_transactions(struct super_block *s,
} }
done: done:
up(&journal->j_flush_sem); mutex_unlock(&journal->j_flush_mutex);
return ret; return ret;
} }
@ -2838,7 +2838,7 @@ int journal_init(struct super_block *p_s_sb, const char *j_dev_name,
journal->j_first = NULL; journal->j_first = NULL;
init_waitqueue_head(&(journal->j_join_wait)); init_waitqueue_head(&(journal->j_join_wait));
mutex_init(&journal->j_mutex); mutex_init(&journal->j_mutex);
sema_init(&journal->j_flush_sem, 1); mutex_init(&journal->j_flush_mutex);
journal->j_trans_id = 10; journal->j_trans_id = 10;
journal->j_mount_id = 10; journal->j_mount_id = 10;

2
include/linux/reiserfs_fs_sb.h
View File

@ -194,7 +194,7 @@ struct reiserfs_journal {
time_t j_trans_start_time; /* time this transaction started */ time_t j_trans_start_time; /* time this transaction started */
struct mutex j_mutex; struct mutex j_mutex;
struct semaphore j_flush_sem; struct mutex j_flush_mutex;
wait_queue_head_t j_join_wait; /* wait for current transaction to finish before starting new one */ wait_queue_head_t j_join_wait; /* wait for current transaction to finish before starting new one */
atomic_t j_jlock; /* lock for j_join_wait */ atomic_t j_jlock; /* lock for j_join_wait */
int j_list_bitmap_index; /* number of next list bitmap to use */ int j_list_bitmap_index; /* number of next list bitmap to use */