Skip to content

Commit

Permalink
net: openvswitch: suitable access to the dp_meters
Browse files Browse the repository at this point in the history
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: kbuild test robot <lkp@intel.com>
Signed-off-by: Tonghao Zhang <xiangxia.m.yue@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Tonghao Zhang authored and David S. Miller committed Apr 26, 2020
1 parent 06b439d commit 4b36a0d
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions net/openvswitch/meter.c
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,8 @@ dp_meter_instance_realloc(struct dp_meter_table *tbl, u32 size)
return -ENOMEM;

for (i = 0; i < n_meters; i++)
new_ti->dp_meters[i] =
rcu_dereference_ovsl(ti->dp_meters[i]);
if (rcu_dereference_ovsl(ti->dp_meters[i]))
new_ti->dp_meters[i] = ti->dp_meters[i];

rcu_assign_pointer(tbl->ti, new_ti);
call_rcu(&ti->rcu, dp_meter_instance_free_rcu);
Expand Down Expand Up @@ -752,7 +752,7 @@ void ovs_meters_exit(struct datapath *dp)
int 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);
}

0 comments on commit 4b36a0d

Please sign in to comment.