lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[IPV4]: rt_cache_get_next should take rt_genid into account.

Browse Source 
In the other case /proc/net/rt_cache will look inconsistent in respect to
genid.

Signed-off-by: Denis V. Lunev <den@openvz.org>
Acked-by: Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Denis V. Lunev
2008-02-28 20:50:33 -08:00
committed by David S. Miller
parent 317805b8f8
commit 642d631811
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
net/ipv4/route.c
View File

@@ -294,7 +294,8 @@ static struct rtable *rt_cache_get_first(struct rt_cache_iter_state *st)
return r; return r;
} }
static struct rtable *rt_cache_get_next(struct rt_cache_iter_state *st, struct rtable *r) static struct rtable *__rt_cache_get_next(struct rt_cache_iter_state *st,
struct rtable *r)
{ {
r = r->u.dst.rt_next; r = r->u.dst.rt_next;
while (!r) { while (!r) {
@@ -307,16 +308,23 @@ static struct rtable *rt_cache_get_next(struct rt_cache_iter_state *st, struct r
return rcu_dereference(r); return rcu_dereference(r);
} }
static struct rtable *rt_cache_get_next(struct rt_cache_iter_state *st,
struct rtable *r)
{
while ((r = __rt_cache_get_next(st, r)) != NULL) {
if (r->rt_genid == st->genid)
break;
}
return r;
}
static struct rtable *rt_cache_get_idx(struct rt_cache_iter_state *st, loff_t pos) static struct rtable *rt_cache_get_idx(struct rt_cache_iter_state *st, loff_t pos)
{ {
struct rtable *r = rt_cache_get_first(st); struct rtable *r = rt_cache_get_first(st);
if (r) if (r)
while (pos && (r = rt_cache_get_next(st, r))) { while (pos && (r = rt_cache_get_next(st, r)))
if (r->rt_genid != st->genid)
continue;
--pos; --pos;
}
return pos ? NULL : r; return pos ? NULL : r;
} }