fcoe: add missing destroy_workqueue() on error in fcoe_init()

weiyj · martinkpetersen · commit a561a8ea8371 · 2016-08-02T01:18:05.000-04:00
Add the missing destroy_workqueue() before return from fcoe_init() in
the fcoe transport register failed error handling case.

Signed-off-by: Wei Yongjun &lt;weiyj.lk@gmail.com&gt;
Acked-by: Johannes Thumshirn &lt;jth@kernel.org&gt;
Signed-off-by: Martin K. Petersen &lt;martin.petersen@oracle.com&gt;
diff --git a/drivers/scsi/fcoe/fcoe.c b/drivers/scsi/fcoe/fcoe.c
@@ -2495,7 +2495,7 @@ static int __init fcoe_init(void)
 	if (rc) {
 		printk(KERN_ERR "failed to register an fcoe transport, check "
 			"if libfcoe is loaded\n");
-		return rc;
+		goto out_destroy;
 	}
 
 	mutex_lock(&fcoe_config_mutex);
@@ -2518,6 +2518,7 @@ static int __init fcoe_init(void)
 
 out_free:
 	mutex_unlock(&fcoe_config_mutex);
+out_destroy:
 	destroy_workqueue(fcoe_wq);
 	return rc;
 }

Original file line number	Diff line number	Diff line change
`@@ -2495,7 +2495,7 @@ static int __init fcoe_init(void)`
`2495`	`2495`	`if (rc) {`
`2496`	`2496`	`printk(KERN_ERR "failed to register an fcoe transport, check "`
`2497`	`2497`	`"if libfcoe is loaded\n");`
`2498`		`- return rc;`
	`2498`	`+ goto out_destroy;`
`2499`	`2499`	`}`
`2500`	`2500`
`2501`	`2501`	`mutex_lock(&fcoe_config_mutex);`
`@@ -2518,6 +2518,7 @@ static int __init fcoe_init(void)`
`2518`	`2518`
`2519`	`2519`	`out_free:`
`2520`	`2520`	`mutex_unlock(&fcoe_config_mutex);`
	`2521`	`+out_destroy:`
`2521`	`2522`	`destroy_workqueue(fcoe_wq);`
`2522`	`2523`	`return rc;`
`2523`	`2524`	`}`