diff --git a/[refs] b/[refs]
index 771bb8e0822d..9bda23fb0e19 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9786f6e68af00d0988ad7f51fe3fd118be1c30ad
+refs/heads/master: 51b11e3630672b7ce8793ecf13e5759656edf38a
diff --git a/trunk/fs/jffs2/wbuf.c b/trunk/fs/jffs2/wbuf.c
index 4515bea0268f..a10fb24ca6e6 100644
--- a/trunk/fs/jffs2/wbuf.c
+++ b/trunk/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();
 	}