Re: [PATCH 9/12] drivers/scsi/qla2xxx: Add missing unlock

[Giridhar Malavali]

On Mon, 29 Mar 2010, Julia Lawall wrote:

> From: Julia Lawall <julia@xxxxxxx>
>
> This code represents error handling code.  Add an unlock as done in the
> normal exit path from the function.
>
> A simplified version of the semantic patch that finds this problem is as
> follows: (http://coccinelle.lip6.fr/)
>
> // <smpl>
> @r exists@
> expression E1;
> identifier f;
> @@
>
> f (...) { <+...
> * spin_lock_irqsave (E1,...);
> ... when != E1
> * return ...;
> ...+> }
> // </smpl>
>
> Signed-off-by: Julia Lawall <julia@xxxxxxx>
>
> ---
> drivers/scsi/qla2xxx/qla_attr.c     |    1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
> index 90d1e06..e8ace7a 100644
> --- a/drivers/scsi/qla2xxx/qla_attr.c
> +++ b/drivers/scsi/qla2xxx/qla_attr.c
> @@ -2392,6 +2392,7 @@ done:
> 		kfree(sp->fcport);
> 	kfree(sp->ctx);
> 	mempool_free(sp, ha->srb_mempool);
> +	spin_unlock_irqrestore(&ha->hardware_lock, flags);
> 	return 0;
> }
James,

Can u please include this patch.
Here is the pointer for the similar patch submitted previously which I acked.
http://marc.info/?l=linux-scsi&m=126877099912968&w=2

With the new BSG patches submitted to scsi-misc at
http://marc.info/?l=linux-scsi&m=126904344832176&w=2, the BSG related code
is moved to new files bsg.[ch]. The patch below will fix the lock imbalance issue
with latest patches submitted to scsi-misc.

Giri
---
diff --git a/drivers/scsi/qla2xxx/qla_bsg.c b/drivers/scsi/qla2xxx/qla_bsg.c
index 387d694..21e5bcd 100644
--- a/drivers/scsi/qla2xxx/qla_bsg.c
+++ b/drivers/scsi/qla2xxx/qla_bsg.c
@@ -1199,6 +1199,7 @@ qla24xx_bsg_timeout(struct fc_bsg_job *bsg_job)
  	return 0;

  done:
+	spin_unlock_irqrestore(&ha->hardware_lock, flags);
  	if (bsg_job->request->msgcode == FC_BSG_HST_CT)
  		kfree(sp->fcport);
  	kfree(sp->ctx);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/