]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[PATCH] ocfs2: Release mutex in error handling code
authorJulia Lawall <julia@diku.dk>
Mon, 21 Jul 2008 07:59:15 +0000 (09:59 +0200)
committerMark Fasheh <mfasheh@suse.com>
Thu, 31 Jul 2008 23:21:14 +0000 (16:21 -0700)
The mutex is released on a successful return, so it would seem that it
should be released on an error return as well.

The semantic patch finds this problem is as follows:
(http://www.emn.fr/x-info/coccinelle/)

// <smpl>
@@
expression l;
@@

mutex_lock(l);
... when != mutex_unlock(l)
    when any
    when strict
(
if (...) { ... when != mutex_unlock(l)
+   mutex_unlock(l);
    return ...;
}
|
mutex_unlock(l);
)
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Mark Fasheh <mfasheh@suse.com>
fs/ocfs2/file.c

index be2dd95d3a1dc0c916229ad4deb643ed0ee841b0..ec2ed15c3daab10894cf249d698a834924d74651 100644 (file)
@@ -1766,8 +1766,8 @@ out_inode_unlock:
 out_rw_unlock:
        ocfs2_rw_unlock(inode, 1);
 
-       mutex_unlock(&inode->i_mutex);
 out:
+       mutex_unlock(&inode->i_mutex);
        return ret;
 }