diff options
| author | Jesse Gross <jesse@nicira.com> | 2011-11-16 16:01:32 -0800 |
|---|---|---|
| committer | Jesse Gross <jesse@nicira.com> | 2011-11-16 16:10:45 -0800 |
| commit | be2ba156813131213f7d494cb284063e82049a65 (patch) | |
| tree | 55abdeb049e1f91cce024fd35aee9065b314b34e /datapath | |
| parent | a9a29d22d8f485bb90bb49ae9ddff8c3c1ab04f5 (diff) | |
datapath: Fix flow table sparse RCU annotations.
Some overzealous marking of pointers as __rcu caused sparse to flag
errors.
Signed-off-by: Jesse Gross <jesse@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
Diffstat (limited to 'datapath')
| -rw-r--r-- | datapath/datapath.c | 2 | ||||
| -rw-r--r-- | datapath/flow.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/datapath/datapath.c b/datapath/datapath.c index 317c404a..44d31a83 100644 --- a/datapath/datapath.c +++ b/datapath/datapath.c @@ -249,7 +249,7 @@ static void destroy_dp_rcu(struct rcu_head *rcu) { struct datapath *dp = container_of(rcu, struct datapath, rcu); - flow_tbl_destroy(dp->table); + flow_tbl_destroy((__force struct flow_table *)dp->table); free_percpu(dp->stats_percpu); kobject_put(&dp->ifobj); } diff --git a/datapath/flow.c b/datapath/flow.c index 9a0df45d..644a377f 100644 --- a/datapath/flow.c +++ b/datapath/flow.c @@ -288,15 +288,15 @@ struct sw_flow *flow_alloc(void) return flow; } -static struct hlist_head __rcu *find_bucket(struct flow_table * table, u32 hash) +static struct hlist_head *find_bucket(struct flow_table *table, u32 hash) { return flex_array_get(table->buckets, (hash & (table->n_buckets - 1))); } -static struct flex_array __rcu *alloc_buckets(unsigned int n_buckets) +static struct flex_array *alloc_buckets(unsigned int n_buckets) { - struct flex_array __rcu *buckets; + struct flex_array *buckets; int i, err; buckets = flex_array_alloc(sizeof(struct hlist_head *), |