Commit 4b36a0df authored by Tonghao Zhang's avatar Tonghao Zhang Committed by David S. Miller

net: openvswitch: suitable access to the dp_meters

To fix the following sparse warning:
| net/openvswitch/meter.c:109:38: sparse: sparse: incorrect type
| in assignment (different address spaces) ...
| net/openvswitch/meter.c:720:45: sparse: sparse: incorrect type
| in argument 1 (different address spaces) ...
Reported-by: default avatarkbuild test robot <lkp@intel.com>
Signed-off-by: default avatarTonghao Zhang <xiangxia.m.yue@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 06b439de
...@@ -107,8 +107,8 @@ dp_meter_instance_realloc(struct dp_meter_table *tbl, u32 size) ...@@ -107,8 +107,8 @@ dp_meter_instance_realloc(struct dp_meter_table *tbl, u32 size)
return -ENOMEM; return -ENOMEM;
for (i = 0; i < n_meters; i++) for (i = 0; i < n_meters; i++)
new_ti->dp_meters[i] = if (rcu_dereference_ovsl(ti->dp_meters[i]))
rcu_dereference_ovsl(ti->dp_meters[i]); new_ti->dp_meters[i] = ti->dp_meters[i];
rcu_assign_pointer(tbl->ti, new_ti); rcu_assign_pointer(tbl->ti, new_ti);
call_rcu(&ti->rcu, dp_meter_instance_free_rcu); call_rcu(&ti->rcu, dp_meter_instance_free_rcu);
...@@ -752,7 +752,7 @@ void ovs_meters_exit(struct datapath *dp) ...@@ -752,7 +752,7 @@ void ovs_meters_exit(struct datapath *dp)
int i; int i;
for (i = 0; i < ti->n_meters; i++) for (i = 0; i < ti->n_meters; i++)
ovs_meter_free(ti->dp_meters[i]); ovs_meter_free(rcu_dereference_raw(ti->dp_meters[i]));
dp_meter_instance_free(ti); dp_meter_instance_free(ti);
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment