The pktgen_output_ipsec() function can unlock this lock twice
due to merged error and plain paths. Remove one of the calls
to spin_unlock.

Other possible solution would be to place "return 0" right 
after the first unlock, but at this place the err is known 
to be 0, so these solutions are the same except for this one
makes the code shorter.

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>

---

diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index de33f36..285ec3e 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -2463,8 +2463,6 @@ static int pktgen_output_ipsec(struct sk_buff *skb, struct pktgen_dev *pkt_dev)
 
 	x->curlft.bytes +=skb->len;
 	x->curlft.packets++;
-	spin_unlock(&x->lock);
-
 error:
 	spin_unlock(&x->lock);
 	return err;

On Mon, 2007-19-11 at 12:47 +0300, Pavel Emelyanov wrote:
> The pktgen_output_ipsec() function can unlock this lock twice
> due to merged error and plain paths. Remove one of the calls
> to spin_unlock.

Good catch.
Acked-by: Jamal Hadi Salim <hadi@cyberus.ca>

cheers,
jamal

From: Pavel Emelyanov <xemul@openvz.org>
Date: Mon, 19 Nov 2007 12:47:00 +0300

> The pktgen_output_ipsec() function can unlock this lock twice
> due to merged error and plain paths. Remove one of the calls
> to spin_unlock.
> 
> Other possible solution would be to place "return 0" right 
> after the first unlock, but at this place the err is known 
> to be 0, so these solutions are the same except for this one
> makes the code shorter.
> 
> Signed-off-by: Pavel Emelyanov <xemul@openvz.org>

Applied, thanks Pavel.