OSDN Git Service

xfrm: move the checking for old xfrm_policy hold_queue to beginning
authorLi RongQing <roy.qing.li@gmail.com>
Thu, 30 Apr 2015 09:25:19 +0000 (17:25 +0800)
committerSteffen Klassert <steffen.klassert@secunet.com>
Tue, 5 May 2015 07:27:01 +0000 (09:27 +0200)
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>
net/xfrm/xfrm_policy.c

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