leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xfrm: move the checking for old xfrm_policy hold_queue to beginning

Browse Source 
if hold_queue of old xfrm_policy is NULL, return directly, then not need to
run other codes, especially take the spin lock

Signed-off-by: Li RongQing <roy.qing.li@gmail.com>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
This commit is contained in:
Li RongQing
2015-04-30 17:25:19 +08:00
committed by Steffen Klassert
parent 586f2eb416
commit de2ad486cb
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
net/xfrm/xfrm_policy.c
View File

@@ -700,6 +700,9 @@ static void xfrm_policy_requeue(struct xfrm_policy *old,
struct xfrm_policy_queue *pq = &old->polq; struct xfrm_policy_queue *pq = &old->polq;
struct sk_buff_head list; struct sk_buff_head list;
if (skb_queue_empty(&pq->hold_queue))
return;
__skb_queue_head_init(&list); __skb_queue_head_init(&list);
spin_lock_bh(&pq->hold_queue.lock); spin_lock_bh(&pq->hold_queue.lock);
@@ -708,9 +711,6 @@ static void xfrm_policy_requeue(struct xfrm_policy *old,
xfrm_pol_put(old); xfrm_pol_put(old);
spin_unlock_bh(&pq->hold_queue.lock); spin_unlock_bh(&pq->hold_queue.lock);
if (skb_queue_empty(&list))
return;
pq = &new->polq; pq = &new->polq;
spin_lock_bh(&pq->hold_queue.lock); spin_lock_bh(&pq->hold_queue.lock);