joel16/android_kernel_sony_msm8994
1
0
Fork 0
mirror of https://github.com/joel16/android_kernel_sony_msm8994.git synced 2025-03-04 03:10:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

neigh: __rcu annotations

Browse Source 
fix some minor issues and sparse (__rcu) warnings

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eric Dumazet 2011-01-19 22:02:47 +00:00 committed by David S. Miller
parent 753ea8e962
commit 6193d2be29
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
net/core/neighbour.c
View File

@ -316,7 +316,7 @@ static struct neigh_hash_table *neigh_hash_alloc(unsigned int entries)
{ {
size_t size = entries * sizeof(struct neighbour *); size_t size = entries * sizeof(struct neighbour *);
struct neigh_hash_table *ret; struct neigh_hash_table *ret;
struct neighbour **buckets; struct neighbour __rcu **buckets;
ret = kmalloc(sizeof(*ret), GFP_ATOMIC); ret = kmalloc(sizeof(*ret), GFP_ATOMIC);
if (!ret) if (!ret)
@ -324,14 +324,14 @@ static struct neigh_hash_table *neigh_hash_alloc(unsigned int entries)
if (size <= PAGE_SIZE) if (size <= PAGE_SIZE)
buckets = kzalloc(size, GFP_ATOMIC); buckets = kzalloc(size, GFP_ATOMIC);
else else
buckets = (struct neighbour **) buckets = (struct neighbour __rcu **)
__get_free_pages(GFP_ATOMIC | __GFP_ZERO, __get_free_pages(GFP_ATOMIC | __GFP_ZERO,
get_order(size)); get_order(size));
if (!buckets) { if (!buckets) {
kfree(ret); kfree(ret);
return NULL; return NULL;
} }
rcu_assign_pointer(ret->hash_buckets, buckets); ret->hash_buckets = buckets;
ret->hash_mask = entries - 1; ret->hash_mask = entries - 1;
get_random_bytes(&ret->hash_rnd, sizeof(ret->hash_rnd)); get_random_bytes(&ret->hash_rnd, sizeof(ret->hash_rnd));
return ret; return ret;
@ -343,7 +343,7 @@ static void neigh_hash_free_rcu(struct rcu_head *head)
struct neigh_hash_table, struct neigh_hash_table,
rcu); rcu);
size_t size = (nht->hash_mask + 1) * sizeof(struct neighbour *); size_t size = (nht->hash_mask + 1) * sizeof(struct neighbour *);
struct neighbour **buckets = nht->hash_buckets; struct neighbour __rcu **buckets = nht->hash_buckets;
if (size <= PAGE_SIZE) if (size <= PAGE_SIZE)
kfree(buckets); kfree(buckets);
@ -1540,7 +1540,7 @@ void neigh_table_init_no_netlink(struct neigh_table *tbl)
panic("cannot create neighbour proc dir entry"); panic("cannot create neighbour proc dir entry");
#endif #endif
tbl->nht = neigh_hash_alloc(8); RCU_INIT_POINTER(tbl->nht, neigh_hash_alloc(8));
phsize = (PNEIGH_HASHMASK + 1) * sizeof(struct pneigh_entry *); phsize = (PNEIGH_HASHMASK + 1) * sizeof(struct pneigh_entry *);
tbl->phash_buckets = kzalloc(phsize, GFP_KERNEL); tbl->phash_buckets = kzalloc(phsize, GFP_KERNEL);
@ -1602,7 +1602,8 @@ int neigh_table_clear(struct neigh_table *tbl)
} }
write_unlock(&neigh_tbl_lock); write_unlock(&neigh_tbl_lock);
call_rcu(&tbl->nht->rcu, neigh_hash_free_rcu); call_rcu(&rcu_dereference_protected(tbl->nht, 1)->rcu,
neigh_hash_free_rcu);
tbl->nht = NULL; tbl->nht = NULL;
kfree(tbl->phash_buckets); kfree(tbl->phash_buckets);