From: Ben Pfaff <blp@nicira.com>
Date: Mon, 16 Sep 2013 21:37:09 +0000 (-0700)
Subject: ofproto-dpif: Use shash_find_and_delete() to simplify close_dpif_backer().
X-Git-Tag: sliver-openvswitch-2.0.90-1~13^2~33
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=4f7cc3c7252e2284f72a890929504f56af7caba2;p=sliver-openvswitch.git

ofproto-dpif: Use shash_find_and_delete() to simplify close_dpif_backer().

Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Jarno Rajahalme <jrajahalme@nicira.com>
---

diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c
index b41c179e6..28dc66124 100644
--- a/ofproto/ofproto-dpif.c
+++ b/ofproto/ofproto-dpif.c
@@ -1079,8 +1079,6 @@ dealloc(struct ofproto *ofproto_)
 static void
 close_dpif_backer(struct dpif_backer *backer)
 {
-    struct shash_node *node;
-
     ovs_assert(backer->refcount > 0);
 
     if (--backer->refcount) {
@@ -1095,9 +1093,8 @@ close_dpif_backer(struct dpif_backer *backer)
     simap_destroy(&backer->tnl_backers);
     ovs_rwlock_destroy(&backer->odp_to_ofport_lock);
     hmap_destroy(&backer->odp_to_ofport_map);
-    node = shash_find(&all_dpif_backers, backer->type);
+    shash_find_and_delete(&all_dpif_backers, backer->type);
     free(backer->type);
-    shash_delete(&all_dpif_backers, node);
     dpif_close(backer->dpif);
 
     ovs_assert(hmap_is_empty(&backer->subfacets));