From 90a13447a02eb92ca90497556c5a15aad3a38a3e Mon Sep 17 00:00:00 2001 From: Frederic Weisbecker Date: Fri, 8 May 2009 20:01:09 +0200 Subject: [PATCH] --- yaml --- r: 173172 b: refs/heads/master c: c63e3c0b2498adec921b06c670d12c8c74b85538 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/reiserfs/journal.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 49cbe99ba3b9..7d66ab834e84 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d6f5b0aa08078c3dabe377d5b1a6077e9c9352d3 +refs/heads/master: c63e3c0b2498adec921b06c670d12c8c74b85538 diff --git a/trunk/fs/reiserfs/journal.c b/trunk/fs/reiserfs/journal.c index ffb7f50abc2f..e9a972bd0323 100644 --- a/trunk/fs/reiserfs/journal.c +++ b/trunk/fs/reiserfs/journal.c @@ -566,11 +566,9 @@ static inline void insert_journal_hash(struct reiserfs_journal_cnode **table, static inline void reiserfs_mutex_lock_safe(struct mutex *m, struct super_block *s) { - while (!mutex_trylock(m)) { - reiserfs_write_unlock(s); - schedule(); - reiserfs_write_lock(s); - } + reiserfs_write_unlock(s); + mutex_lock(m); + reiserfs_write_lock(s); } /* lock the current transaction */