aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>2006-03-20 16:59:27 -0800
committerDavid S. Miller <davem@davemloft.net>2006-03-20 16:59:27 -0800
commite40cf3533c712b941d4c8ebb3eca892d55c32c34 (patch)
treec70e06da96263fdcb908ef9d654a69d33cb52ff1
parentfb9de91ea8035b99757d9f8a04aa058c982c361b (diff)
[IPV6]: ROUTE: Convert rt6_cow() to rt6_alloc_cow().
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/ipv6/route.c57
1 files changed, 25 insertions, 32 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index cd60bcca106..061a7bba163 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -397,10 +397,6 @@ int ip6_ins_rt(struct rt6_info *rt, struct nlmsghdr *nlh,
return err;
}
-/* No rt6_lock! If COW failed, the function returns dead route entry
- with dst->error set to errno value.
- */
-
static struct rt6_info *rt6_alloc_cow(struct rt6_info *ort, struct in6_addr *daddr,
struct in6_addr *saddr)
{
@@ -439,26 +435,6 @@ static struct rt6_info *rt6_alloc_cow(struct rt6_info *ort, struct in6_addr *dad
return rt;
}
-static struct rt6_info *rt6_cow(struct rt6_info *ort, struct in6_addr *daddr,
- struct in6_addr *saddr, struct netlink_skb_parms *req)
-{
- struct rt6_info *rt = rt6_alloc_cow(ort, daddr, saddr);
- int err;
-
- if (!rt) {
- dst_hold(&ip6_null_entry.u.dst);
- return &ip6_null_entry;
- }
-
- dst_hold(&rt->u.dst);
-
- err = ip6_ins_rt(rt, NULL, NULL, req);
- if (err)
- rt->u.dst.error = err;
-
- return rt;
-}
-
static struct rt6_info *rt6_alloc_clone(struct rt6_info *ort, struct in6_addr *daddr)
{
struct rt6_info *rt = ip6_rt_copy(ort);
@@ -518,15 +494,23 @@ restart:
if (!rt->rt6i_nexthop && !(rt->rt6i_flags & RTF_NONEXTHOP)) {
struct rt6_info *nrt;
+ int err;
- nrt = rt6_cow(rt, &skb->nh.ipv6h->daddr,
- &skb->nh.ipv6h->saddr,
- &NETLINK_CB(skb));
+ nrt = rt6_alloc_cow(rt, &skb->nh.ipv6h->daddr,
+ &skb->nh.ipv6h->saddr);
dst_release(&rt->u.dst);
- rt = nrt;
+ rt = nrt ? : &ip6_null_entry;
+
+ dst_hold(&rt->u.dst);
+ if (nrt) {
+ err = ip6_ins_rt(nrt, NULL, NULL,
+ &NETLINK_CB(skb));
+ if (!err)
+ goto out2;
+ }
- if (rt->u.dst.error != -EEXIST || --attempts <= 0)
+ if (--attempts <= 0)
goto out2;
/* Race condition! In the gap, when rt6_lock was
@@ -582,13 +566,21 @@ restart:
if (!rt->rt6i_nexthop && !(rt->rt6i_flags & RTF_NONEXTHOP)) {
struct rt6_info *nrt;
+ int err;
- nrt = rt6_cow(rt, &fl->fl6_dst, &fl->fl6_src, NULL);
+ nrt = rt6_alloc_cow(rt, &fl->fl6_dst, &fl->fl6_src);
dst_release(&rt->u.dst);
- rt = nrt;
+ rt = nrt ? : &ip6_null_entry;
- if (rt->u.dst.error != -EEXIST || --attempts <= 0)
+ dst_hold(&rt->u.dst);
+ if (nrt) {
+ err = ip6_ins_rt(nrt, NULL, NULL, NULL);
+ if (!err)
+ goto out2;
+ }
+
+ if (--attempts <= 0)
goto out2;
/* Race condition! In the gap, when rt6_lock was
@@ -597,6 +589,7 @@ restart:
dst_release(&rt->u.dst);
goto relookup;
}
+
out2:
rt->u.dst.lastuse = jiffies;
rt->u.dst.__use++;