summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2008-06-26 10:19:54 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2008-06-26 10:19:54 +1000
commit8d521aa2bf90485635f90e5f0c1daa1fc9f7e3ef (patch)
tree67ae106e08d3e80da1bd4c343816f53c8bf5da16
parent5ab884c163621766e68fa78cdffddc018e7a8960 (diff)
misc:down_nowait-fs_reiserfs_journal
down_trylock -> down_try in fs/reiserfs/journal.c Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
-rw-r--r--fs/reiserfs/journal.c2
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();
}