From 4c50ef3bb5f5e8a0dc854dfa71f4a00a1d97a9a9 Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Thu, 10 Jan 2008 03:55:57 -0800 Subject: [PATCH] --- yaml --- r: 75489 b: refs/heads/master c: 0bcceadceb0907094ba4e40bf9a7cd9b080f13fb h: refs/heads/master i: 75487: 3159dbe1c2f6e375f4420aea74a903c781576937 v: v3 --- [refs] | 2 +- trunk/net/ipv4/route.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index ab62358ff050..5b31d30112cd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9cd40029423701c376391da59d2c6469672b4bed +refs/heads/master: 0bcceadceb0907094ba4e40bf9a7cd9b080f13fb diff --git a/trunk/net/ipv4/route.c b/trunk/net/ipv4/route.c index d3377069ce05..28484f396b04 100644 --- a/trunk/net/ipv4/route.c +++ b/trunk/net/ipv4/route.c @@ -283,12 +283,12 @@ static struct rtable *rt_cache_get_first(struct seq_file *seq) break; rcu_read_unlock_bh(); } - return r; + return rcu_dereference(r); } static struct rtable *rt_cache_get_next(struct seq_file *seq, struct rtable *r) { - struct rt_cache_iter_state *st = rcu_dereference(seq->private); + struct rt_cache_iter_state *st = seq->private; r = r->u.dst.rt_next; while (!r) { @@ -298,7 +298,7 @@ static struct rtable *rt_cache_get_next(struct seq_file *seq, struct rtable *r) rcu_read_lock_bh(); r = rt_hash_table[st->bucket].chain; } - return r; + return rcu_dereference(r); } static struct rtable *rt_cache_get_idx(struct seq_file *seq, loff_t pos)