From 4db20cc55fb2d2014a8b79cafd97dde6f584f49a Mon Sep 17 00:00:00 2001 From: Herbert Xu Date: Mon, 26 Nov 2007 19:07:34 +0800 Subject: [PATCH] --- yaml --- r: 74223 b: refs/heads/master c: 8053fc3de720e1027d690f892ff7d7c1737fdd9d h: refs/heads/master i: 74221: a61e5102eb4f95f2d1ef3d5c90891d57c1df7d4e 74219: 4dc3de647067a60eb2a30937781dbef27657bb14 74215: 441e0e0b2be7f1b700e2880d4c2e19043582b40a 74207: d1dba69f1e7f6a7196eca3075dc371b9fb393c30 v: v3 --- [refs] | 2 +- trunk/net/key/af_key.c | 2 -- trunk/net/xfrm/xfrm_user.c | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 34d63dfd5887..eb2cab49b816 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7f9c33e515353ea91afc62341161fead19e78567 +refs/heads/master: 8053fc3de720e1027d690f892ff7d7c1737fdd9d diff --git a/trunk/net/key/af_key.c b/trunk/net/key/af_key.c index 3b2d864ab942..878039b9557d 100644 --- a/trunk/net/key/af_key.c +++ b/trunk/net/key/af_key.c @@ -1015,9 +1015,7 @@ static inline struct sk_buff *pfkey_xfrm_state2msg(struct xfrm_state *x) { struct sk_buff *skb; - spin_lock_bh(&x->lock); skb = __pfkey_xfrm_state2msg(x, 1, 3); - spin_unlock_bh(&x->lock); return skb; } diff --git a/trunk/net/xfrm/xfrm_user.c b/trunk/net/xfrm/xfrm_user.c index d41588d101d0..e75dbdcb08a4 100644 --- a/trunk/net/xfrm/xfrm_user.c +++ b/trunk/net/xfrm/xfrm_user.c @@ -507,7 +507,6 @@ static int copy_to_user_state_extra(struct xfrm_state *x, struct xfrm_usersa_info *p, struct sk_buff *skb) { - spin_lock_bh(&x->lock); copy_to_user_state(x, p); if (x->coaddr) @@ -515,7 +514,6 @@ static int copy_to_user_state_extra(struct xfrm_state *x, if (x->lastused) NLA_PUT_U64(skb, XFRMA_LASTUSED, x->lastused); - spin_unlock_bh(&x->lock); if (x->aalg) NLA_PUT(skb, XFRMA_ALG_AUTH, alg_len(x->aalg), x->aalg);