Skip to content

Commit

Permalink
[IPV4]: rt_cache_get_next should take rt_genid into account.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Denis V. Lunev authored and David S. Miller committed Feb 29, 2008
1 parent 317805b commit 642d631
Showing 1 changed file with 13 additions and 5 deletions.
18 changes: 13 additions & 5 deletions net/ipv4/route.c
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,8 @@ static struct rtable *rt_cache_get_first(struct rt_cache_iter_state *st)
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;
while (!r) {
Expand All @@ -307,16 +308,23 @@ static struct rtable *rt_cache_get_next(struct rt_cache_iter_state *st, struct 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)
{
struct rtable *r = rt_cache_get_first(st);

if (r)
while (pos && (r = rt_cache_get_next(st, r))) {
if (r->rt_genid != st->genid)
continue;
while (pos && (r = rt_cache_get_next(st, r)))
--pos;
}
return pos ? NULL : r;
}

Expand Down

0 comments on commit 642d631

Please sign in to comment.