diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-07-10 14:38:45 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-07-10 14:38:45 +1000 |
| commit | 4175dddc2fa1d9920bb96712ad9172d9bcdcd8ac (patch) | |
| tree | fb3fbafc3a1be5282984437600d4fcbd32a75643 /fs/reiserfs | |
| parent | db501e75a9996a7f5717982db8f2fe847cfe959d (diff) | |
| parent | d7c3a795527407277cedc074e64d423045cd0c62 (diff) | |
Merge branch 'quilt/rr'
Conflicts:
drivers/char/hvc_console.h
kernel/stop_machine.c
Diffstat (limited to 'fs/reiserfs')
| -rw-r--r-- | fs/reiserfs/journal.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/reiserfs/journal.c b/fs/reiserfs/journal.c index e396b2fa4743..9ec7d66c24a5 100644 --- a/fs/reiserfs/journal.c +++ b/fs/reiserfs/journal.c @@ -1412,7 +1412,7 @@ static int flush_journal_list(struct super_block *s, /* if flushall == 0, the lock is already held */ if (flushall) { down(&journal->j_flush_sem); - } else if (!down_trylock(&journal->j_flush_sem)) { + } else if (down_try(&journal->j_flush_sem)) { BUG(); } |