diff options
| author | Ben Pfaff <blp@nicira.com> | 2014-07-29 09:02:23 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2014-07-29 09:02:23 -0700 |
| commit | 6bc3bb829c5fbcd77a1fd3ee18dbaea49b464e8f (patch) | |
| tree | e8e8776bb2413df7f2a3b5ee43453d83f3e5e9f1 /lib/classifier.c | |
| parent | 022ad2b9ce034c888ea47fd69d72025789b9ba7d (diff) | |
| download | openvswitch-6bc3bb829c5fbcd77a1fd3ee18dbaea49b464e8f.tar.gz | |
cmap: Merge CMAP_FOR_EACH_SAFE into CMAP_FOR_EACH.
There isn't any significant downside to making cmap iteration "safe" all
the time, so this drops the _SAFE variant.
Similar changes to CMAP_CURSOR_FOR_EACH and CMAP_CURSOR_FOR_EACH_CONTINUE.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Jarno Rajahalme <jrajahalme@nicira.com>
Diffstat (limited to 'lib/classifier.c')
| -rw-r--r-- | lib/classifier.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/classifier.c b/lib/classifier.c index 334d0dab5..a6a582cd3 100644 --- a/lib/classifier.c +++ b/lib/classifier.c @@ -485,12 +485,12 @@ classifier_destroy(struct classifier *cls) trie_destroy(&cls->tries[i].root); } - CMAP_FOR_EACH_SAFE (subtable, cmap_node, &cls->subtables_map) { + CMAP_FOR_EACH (subtable, cmap_node, &cls->subtables_map) { destroy_subtable(cls, subtable); } cmap_destroy(&cls->subtables_map); - CMAP_FOR_EACH_SAFE (partition, cmap_node, &cls->partitions) { + CMAP_FOR_EACH (partition, cmap_node, &cls->partitions) { ovsrcu_postpone(free, partition); } cmap_destroy(&cls->partitions); |