summaryrefslogtreecommitdiffstats
path: root/fs/jffs2
diff options
context:
space:
mode:
authorAlexey Khoroshilov <khoroshilov@ispras.ru>2011-06-28 00:21:30 +0400
committerArtem Bityutskiy <artem.bityutskiy@intel.com>2011-09-11 15:02:14 +0300
commit51b11e3630672b7ce8793ecf13e5759656edf38a (patch)
tree90b22e023e1120b475adbb6153283e16eaf6f932 /fs/jffs2
parent9786f6e68af00d0988ad7f51fe3fd118be1c30ad (diff)
downloadlinux-51b11e3630672b7ce8793ecf13e5759656edf38a.tar.bz2
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>
Diffstat (limited to 'fs/jffs2')
-rw-r--r--fs/jffs2/wbuf.c3
1 files changed, 1 insertions, 2 deletions
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();
}