On 05/29/2015 09:50 AM, Eric Dumazet wrote:
> I count 5 places of redundancy.
>
Another two places you found are necessary indeed!
Acked-by: Ying Xue <ying....@windriver.com>
> diff --git a/net/core/neighbour.c b/net/core/neighbour.c
> index
> 3a74df750af4044eba0e7d88ae01ca9b4dac0e72..ac3b69183cc982e722d9683d6de7a39f66b50b64
> 100644
> --- a/net/core/neighbour.c
> +++ b/net/core/neighbour.c
> @@ -141,9 +141,7 @@ static int neigh_forced_gc(struct neigh_table *tbl)
> write_lock(&n->lock);
> if (atomic_read(&n->refcnt) == 1 &&
> !(n->nud_state & NUD_PERMANENT)) {
> - rcu_assign_pointer(*np,
> - rcu_dereference_protected(n->next,
> - lockdep_is_held(&tbl->lock)));
> + *np = n->next;
> n->dead = 1;
> shrunk = 1;
> write_unlock(&n->lock);
> @@ -210,9 +208,7 @@ static void neigh_flush_dev(struct neigh_table *tbl,
> struct net_device *dev)
> np = &n->next;
> continue;
> }
> - rcu_assign_pointer(*np,
> - rcu_dereference_protected(n->next,
> - lockdep_is_held(&tbl->lock)));
> + *np = n->next;
> write_lock(&n->lock);
> neigh_del_timer(n);
> n->dead = 1;
> @@ -380,10 +376,8 @@ static struct neigh_hash_table *neigh_hash_grow(struct
> neigh_table *tbl,
> next = rcu_dereference_protected(n->next,
> lockdep_is_held(&tbl->lock));
>
> - rcu_assign_pointer(n->next,
> - rcu_dereference_protected(
> - new_nht->hash_buckets[hash],
> - lockdep_is_held(&tbl->lock)));
> + n->next = new_nht->hash_buckets[hash];
> +
> rcu_assign_pointer(new_nht->hash_buckets[hash], n);
> }
> }
> @@ -515,9 +509,7 @@ struct neighbour *__neigh_create(struct neigh_table *tbl,
> const void *pkey,
> n->dead = 0;
> if (want_ref)
> neigh_hold(n);
> - rcu_assign_pointer(n->next,
> -
> rcu_dereference_protected(nht->hash_buckets[hash_val],
> -
> lockdep_is_held(&tbl->lock)));
> + n->next = nht->hash_buckets[hash_val];
> rcu_assign_pointer(nht->hash_buckets[hash_val], n);
> write_unlock_bh(&tbl->lock);
> neigh_dbg(2, "neigh %p is created\n", n);
> @@ -2381,9 +2373,7 @@ void __neigh_for_each_release(struct neigh_table *tbl,
> write_lock(&n->lock);
> release = cb(n);
> if (release) {
> - rcu_assign_pointer(*np,
> - rcu_dereference_protected(n->next,
> - lockdep_is_held(&tbl->lock)));
> + *np = n->next;
> n->dead = 1;
> } else
> np = &n->next;
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
