]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[SCSI] scsi_scan.c: Release mutex in error handling code
authorJulia Lawall <julia@diku.dk>
Mon, 21 Jul 2008 07:58:30 +0000 (09:58 +0200)
committerJames Bottomley <James.Bottomley@HansenPartnership.com>
Sat, 26 Jul 2008 19:14:56 +0000 (15:14 -0400)
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 that makes this change 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: James Bottomley <James.Bottomley@HansenPartnership.com>
drivers/scsi/scsi_scan.c

index 196fe3af0d5efaab057619c723d54d2b3d76429c..b7b74489fce75ebe8da0b8d8c1566640abdccf2c 100644 (file)
@@ -1760,6 +1760,7 @@ static void scsi_finish_async_scan(struct async_scan_data *data)
                printk("%s called twice for host %d", __FUNCTION__,
                                shost->host_no);
                dump_stack();
+               mutex_unlock(&shost->scan_mutex);
                return;
        }