From: Alexey Khoroshilov <khoroshilov@ispras.ru>
Date: Mon, 27 Jun 2011 20:21:30 +0000 (+0400)
Subject: jffs2: use mutex_is_locked() in __jffs2_flush_wbuf()
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=51b11e3630672b7ce8793ecf13e5759656edf38a;p=linux-beck.git

jffs2: use mutex_is_locked() in __jffs2_flush_wbuf()

Use a helper to test if a mutex is held instead of a hack with
mutex_trylock().

Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
Signed-off-by: Artem Bityutskiy <dedekind1@gmail.com>
---

diff --git a/fs/jffs2/wbuf.c b/fs/jffs2/wbuf.c
index 4515bea0268f..a10fb24ca6e6 100644
--- a/fs/jffs2/wbuf.c
+++ b/fs/jffs2/wbuf.c
@@ -578,8 +578,7 @@ static int __jffs2_flush_wbuf(struct jffs2_sb_info *c, int pad)
 	if (!jffs2_is_writebuffered(c))
 		return 0;
 
-	if (mutex_trylock(&c->alloc_sem)) {
-		mutex_unlock(&c->alloc_sem);
+	if (!mutex_is_locked(&c->alloc_sem)) {
 		printk(KERN_CRIT "jffs2_flush_wbuf() called with alloc_sem not locked!\n");
 		BUG();
 	}