diff options
| author | David S. Miller <davem@davemloft.net> | 2011-02-16 14:08:44 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-02-17 15:44:00 -0800 |
| commit | 3c7bd1a14071b99d6535b710bc998ae5d3abbb66 (patch) | |
| tree | 05f31758aa4d6b49b70a4af4a8df4a83588610c2 /net/ipv4 | |
| parent | 0c4dcd58fd69aded93b0dc6917cd88b262c8aa3f (diff) | |
| download | op-kernel-dev-3c7bd1a14071b99d6535b710bc998ae5d3abbb66.zip op-kernel-dev-3c7bd1a14071b99d6535b710bc998ae5d3abbb66.tar.gz | |
net: Add initial_ref arg to dst_alloc().
This allows avoiding multiple writes to the initial __refcnt.
The most simplest cases of wanting an initial reference of "1"
in ipv4 and ipv6 have been converted, the rest have been left
along and kept at the existing "0".
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/route.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/net/ipv4/route.c b/net/ipv4/route.c index 79a2871..9841543 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -1818,12 +1818,10 @@ static void rt_set_nexthop(struct rtable *rt, struct fib_result *res, u32 itag) static struct rtable *rt_dst_alloc(bool nopolicy, bool noxfrm) { - struct rtable *rt = dst_alloc(&ipv4_dst_ops); + struct rtable *rt = dst_alloc(&ipv4_dst_ops, 1); if (rt) { rt->dst.obsolete = -1; - atomic_set(&rt->dst.__refcnt, 1); - rt->dst.flags = DST_HOST | (nopolicy ? DST_NOPOLICY : 0) | (noxfrm ? DST_NOXFRM : 0); @@ -2679,12 +2677,11 @@ static int ipv4_dst_blackhole(struct net *net, struct rtable **rp, struct flowi { struct rtable *ort = *rp; struct rtable *rt = (struct rtable *) - dst_alloc(&ipv4_dst_blackhole_ops); + dst_alloc(&ipv4_dst_blackhole_ops, 1); if (rt) { struct dst_entry *new = &rt->dst; - atomic_set(&new->__refcnt, 1); new->__use = 1; new->input = dst_discard; new->output = dst_discard; |
