diff options
| author | Stephen Hemminger <shemminger@vyatta.com> | 2008-03-23 01:59:58 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-23 01:59:58 +0100 |
| commit | 6440cc9e0f48ade57af7be28008cbfa6a991f287 (patch) | |
| tree | 233300e665ed862dab958087b8afa31baaf0ef5f /net/ipv4 | |
| parent | [TCP]: Let skbs grow over a page on fast peers (diff) | |
| download | linux-6440cc9e0f48ade57af7be28008cbfa6a991f287.tar.xz linux-6440cc9e0f48ade57af7be28008cbfa6a991f287.zip | |
[IPV4] fib_trie: fix warning from rcu_assign_poinger
This gets rid of a warning caused by the test in rcu_assign_pointer.
I tried to fix rcu_assign_pointer, but that devolved into a long set
of discussions about doing it right that came to no real solution.
Since the test in rcu_assign_pointer for constant NULL would never
succeed in fib_trie, just open code instead.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/fib_trie.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c index 1ff446d0fa8b..f6cdc012eec5 100644 --- a/net/ipv4/fib_trie.c +++ b/net/ipv4/fib_trie.c @@ -177,10 +177,13 @@ static inline struct tnode *node_parent_rcu(struct node *node) return rcu_dereference(ret); } +/* Same as rcu_assign_pointer + * but that macro() assumes that value is a pointer. + */ static inline void node_set_parent(struct node *node, struct tnode *ptr) { - rcu_assign_pointer(node->parent, - (unsigned long)ptr | NODE_TYPE(node)); + smp_wmb(); + node->parent = (unsigned long)ptr | NODE_TYPE(node); } static inline struct node *tnode_get_child(struct tnode *tn, unsigned int i) |