xfrm: remove policy lock when accessing policy->walk.dead

[safe/jmp/linux-2.6] / net / xfrm / xfrm_user.c

diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
index da5ba86..a267fbd 100644 (file)
--- a/net/xfrm/xfrm_user.c
+++ b/net/xfrm/xfrm_user.c
@@ -1770,13 +1770,9 @@ static int xfrm_add_pol_expire(struct sk_buff *skb, struct nlmsghdr *nlh,
        if (xp == NULL)
                return -ENOENT;
 
-       read_lock(&xp->lock);
-       if (xp->walk.dead) {
-               read_unlock(&xp->lock);
+       if (unlikely(xp->walk.dead))
                goto out;
-       }
 
-       read_unlock(&xp->lock);
        err = 0;
        if (up->hard) {
                uid_t loginuid = NETLINK_CB(skb).loginuid;