* [PATCH 1/7] drivers/infiniband: Release mutex in error handling code
@ 2008-07-21 7:57 ` Julia Lawall
0 siblings, 0 replies; 6+ messages in thread
From: Julia Lawall @ 2008-07-21 7:57 UTC (permalink / raw)
To: rolandd, sean.hefty, hal.rosenstock, general, linux-kernel,
kernel-janitors
From: Julia Lawall <julia@diku.dk>
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>
---
diff -u -p a/drivers/infiniband/hw/ehca/ipz_pt_fn.c b/drivers/infiniband/hw/ehca/ipz_pt_fn.c
--- a/drivers/infiniband/hw/ehca/ipz_pt_fn.c
+++ b/drivers/infiniband/hw/ehca/ipz_pt_fn.c
@@ -163,6 +163,7 @@ static int alloc_small_queue_page(struct
out:
ehca_err(pd->ib_pd.device, "failed to allocate small queue page");
+ mutex_unlock(&pd->lock);
return 0;
}
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/7] drivers/infiniband: Release mutex in error handling code
@ 2008-07-21 7:57 ` Julia Lawall
0 siblings, 0 replies; 6+ messages in thread
From: Julia Lawall @ 2008-07-21 7:57 UTC (permalink / raw)
To: rolandd, sean.hefty, hal.rosenstock, general, linux-kernel,
kernel-janitors
From: Julia Lawall <julia@diku.dk>
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>
---
diff -u -p a/drivers/infiniband/hw/ehca/ipz_pt_fn.c b/drivers/infiniband/hw/ehca/ipz_pt_fn.c
--- a/drivers/infiniband/hw/ehca/ipz_pt_fn.c
+++ b/drivers/infiniband/hw/ehca/ipz_pt_fn.c
@@ -163,6 +163,7 @@ static int alloc_small_queue_page(struct
out:
ehca_err(pd->ib_pd.device, "failed to allocate small queue page");
+ mutex_unlock(&pd->lock);
return 0;
}
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/7] drivers/infiniband: Release mutex in error handling code
2008-07-21 7:57 ` Julia Lawall
@ 2008-07-21 16:25 ` Roland Dreier
-1 siblings, 0 replies; 6+ messages in thread
From: Roland Dreier @ 2008-07-21 16:25 UTC (permalink / raw)
To: Julia Lawall
Cc: rolandd, sean.hefty, hal.rosenstock, general, linux-kernel,
kernel-janitors, hnguyen, raisch
> --- a/drivers/infiniband/hw/ehca/ipz_pt_fn.c
> +++ b/drivers/infiniband/hw/ehca/ipz_pt_fn.c
> @@ -163,6 +163,7 @@ static int alloc_small_queue_page(struct
>
> out:
> ehca_err(pd->ib_pd.device, "failed to allocate small queue page");
> + mutex_unlock(&pd->lock);
> return 0;
> }
Thanks, looks obviously correct. ehca guys, I will queue this for my
next pull request to Linus; please let me know if you see a problem and
want me to drop it.
- R.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/7] drivers/infiniband: Release mutex in error handling code
@ 2008-07-21 16:25 ` Roland Dreier
0 siblings, 0 replies; 6+ messages in thread
From: Roland Dreier @ 2008-07-21 16:25 UTC (permalink / raw)
To: Julia Lawall
Cc: rolandd, sean.hefty, hal.rosenstock, general, linux-kernel,
kernel-janitors, hnguyen, raisch
> --- a/drivers/infiniband/hw/ehca/ipz_pt_fn.c
> +++ b/drivers/infiniband/hw/ehca/ipz_pt_fn.c
> @@ -163,6 +163,7 @@ static int alloc_small_queue_page(struct
>
> out:
> ehca_err(pd->ib_pd.device, "failed to allocate small queue page");
> + mutex_unlock(&pd->lock);
> return 0;
> }
Thanks, looks obviously correct. ehca guys, I will queue this for my
next pull request to Linus; please let me know if you see a problem and
want me to drop it.
- R.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/7] drivers/infiniband: Release mutex in error handling code
2008-07-21 16:25 ` Roland Dreier
@ 2008-07-21 18:28 ` Hoang-Nam Nguyen
-1 siblings, 0 replies; 6+ messages in thread
From: Hoang-Nam Nguyen @ 2008-07-21 18:28 UTC (permalink / raw)
To: Roland Dreier
Cc: Christoph Raisch, general, hal.rosenstock, Julia Lawall,
kernel-janitors, linux-kernel, rolandd, sean.hefty
Roland and Julia,
Looks good to me. Thanks for pointing this out.
Nam
Roland Dreier <rdreier@cisco.com> wrote on 21.07.2008 18:25:07:
> > --- a/drivers/infiniband/hw/ehca/ipz_pt_fn.c
> > +++ b/drivers/infiniband/hw/ehca/ipz_pt_fn.c
> > @@ -163,6 +163,7 @@ static int alloc_small_queue_page(struct
> >
> > out:
> > ehca_err(pd->ib_pd.device, "failed to allocate small queue page");
> > + mutex_unlock(&pd->lock);
> > return 0;
> > }
>
> Thanks, looks obviously correct. ehca guys, I will queue this for my
> next pull request to Linus; please let me know if you see a problem and
> want me to drop it.
>
> - R.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/7] drivers/infiniband: Release mutex in error handling code
@ 2008-07-21 18:28 ` Hoang-Nam Nguyen
0 siblings, 0 replies; 6+ messages in thread
From: Hoang-Nam Nguyen @ 2008-07-21 18:28 UTC (permalink / raw)
To: Roland Dreier
Cc: Christoph Raisch, general, hal.rosenstock, Julia Lawall,
kernel-janitors, linux-kernel, rolandd, sean.hefty
Roland and Julia,
Looks good to me. Thanks for pointing this out.
Nam
Roland Dreier <rdreier@cisco.com> wrote on 21.07.2008 18:25:07:
> > --- a/drivers/infiniband/hw/ehca/ipz_pt_fn.c
> > +++ b/drivers/infiniband/hw/ehca/ipz_pt_fn.c
> > @@ -163,6 +163,7 @@ static int alloc_small_queue_page(struct
> >
> > out:
> > ehca_err(pd->ib_pd.device, "failed to allocate small queue page");
> > + mutex_unlock(&pd->lock);
> > return 0;
> > }
>
> Thanks, looks obviously correct. ehca guys, I will queue this for my
> next pull request to Linus; please let me know if you see a problem and
> want me to drop it.
>
> - R.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2008-07-21 18:30 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-07-21 7:57 [PATCH 1/7] drivers/infiniband: Release mutex in error handling code Julia Lawall
2008-07-21 7:57 ` Julia Lawall
2008-07-21 16:25 ` Roland Dreier
2008-07-21 16:25 ` Roland Dreier
2008-07-21 18:28 ` Hoang-Nam Nguyen
2008-07-21 18:28 ` Hoang-Nam Nguyen
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.