libnetwork/drivers/macvlan, ipvlan: un-embed mutexes

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

daemon/libnetwork/drivers/ipvlan/ipvlan.go

@@ -31,9 +31,11 @@ const (
 )
 
 type driver struct {
-	networks map[string]*network
-	sync.Mutex
 	store *datastore.Store
+
+	// mu protects the networks map.
+	mu       sync.Mutex
+	networks map[string]*network
 }
 
 type endpoint struct {
@@ -48,11 +50,13 @@ type endpoint struct {
 }
 
 type network struct {
-	id        string
+	id     string
+	driver *driver
+	config *configuration
+
+	// mu protects the endpoints map.
+	mu        sync.Mutex
 	endpoints map[string]*endpoint
-	driver    *driver
-	config    *configuration
-	sync.Mutex
 }
 
 // Register initializes and registers the libnetwork ipvlan driver.

daemon/libnetwork/drivers/ipvlan/ipvlan_state.go

@@ -11,9 +11,9 @@ import (
 )
 
 func (d *driver) network(nid string) *network {
-	d.Lock()
+	d.mu.Lock()
 	n, ok := d.networks[nid]
-	d.Unlock()
+	d.mu.Unlock()
 	if !ok {
 		log.G(context.TODO()).Errorf("network id %s not found", nid)
 	}
@@ -22,21 +22,21 @@ func (d *driver) network(nid string) *network {
 }
 
 func (d *driver) addNetwork(n *network) {
-	d.Lock()
+	d.mu.Lock()
 	d.networks[n.id] = n
-	d.Unlock()
+	d.mu.Unlock()
 }
 
 func (d *driver) deleteNetwork(nid string) {
-	d.Lock()
+	d.mu.Lock()
 	delete(d.networks, nid)
-	d.Unlock()
+	d.mu.Unlock()
 }
 
 // getNetworks Safely returns a slice of existing networks
 func (d *driver) getNetworks() []*network {
-	d.Lock()
-	defer d.Unlock()
+	d.mu.Lock()
+	defer d.mu.Unlock()
 
 	ls := make([]*network, 0, len(d.networks))
 	for _, nw := range d.networks {
@@ -50,8 +50,8 @@ func (n *network) endpoint(eid string) (*endpoint, error) {
 	if eid == "" {
 		return nil, errors.New("invalid endpoint id")
 	}
-	n.Lock()
-	defer n.Unlock()
+	n.mu.Lock()
+	defer n.mu.Unlock()
 
 	ep, ok := n.endpoints[eid]
 	if !ok || ep == nil {
@@ -61,15 +61,15 @@ func (n *network) endpoint(eid string) (*endpoint, error) {
 }
 
 func (n *network) addEndpoint(ep *endpoint) {
-	n.Lock()
+	n.mu.Lock()
 	n.endpoints[ep.id] = ep
-	n.Unlock()
+	n.mu.Unlock()
 }
 
 func (n *network) deleteEndpoint(eid string) {
-	n.Lock()
+	n.mu.Lock()
 	delete(n.endpoints, eid)
-	n.Unlock()
+	n.mu.Unlock()
 }
 
 func validateID(nid, eid string) error {
@@ -84,15 +84,15 @@ func validateID(nid, eid string) error {
 }
 
 func (d *driver) getNetwork(id string) (*network, error) {
-	d.Lock()
-	defer d.Unlock()
 	if id == "" {
-		return nil, types.InvalidParameterErrorf("invalid network id: %s", id)
+		return nil, types.InvalidParameterErrorf("invalid network id")
 	}
 
-	if nw, ok := d.networks[id]; ok {
-		return nw, nil
+	d.mu.Lock()
+	defer d.mu.Unlock()
+	nw, ok := d.networks[id]
+	if !ok || nw == nil {
+		return nil, types.NotFoundErrorf("network not found: %s", id)
 	}
-
-	return nil, types.NotFoundErrorf("network not found: %s", id)
+	return nw, nil
 }

daemon/libnetwork/drivers/macvlan/macvlan.go

@@ -25,9 +25,11 @@ const (
 )
 
 type driver struct {
-	networks map[string]*network
-	sync.Mutex
 	store *datastore.Store
+
+	// mu protects the networks map.
+	mu       sync.Mutex
+	networks map[string]*network
 }
 
 type endpoint struct {
@@ -42,11 +44,13 @@ type endpoint struct {
 }
 
 type network struct {
-	id        string
+	id     string
+	driver *driver
+	config *configuration
+
+	// mu protects the endpoints map.
+	mu        sync.Mutex
 	endpoints map[string]*endpoint
-	driver    *driver
-	config    *configuration
-	sync.Mutex
 }
 
 // Register initializes and registers the libnetwork macvlan driver

daemon/libnetwork/drivers/macvlan/macvlan_state.go

@@ -11,9 +11,9 @@ import (
 )
 
 func (d *driver) network(nid string) *network {
-	d.Lock()
+	d.mu.Lock()
 	n, ok := d.networks[nid]
-	d.Unlock()
+	d.mu.Unlock()
 	if !ok {
 		log.G(context.TODO()).Errorf("network id %s not found", nid)
 	}
@@ -22,21 +22,21 @@ func (d *driver) network(nid string) *network {
 }
 
 func (d *driver) addNetwork(n *network) {
-	d.Lock()
+	d.mu.Lock()
 	d.networks[n.id] = n
-	d.Unlock()
+	d.mu.Unlock()
 }
 
 func (d *driver) deleteNetwork(nid string) {
-	d.Lock()
+	d.mu.Lock()
 	delete(d.networks, nid)
-	d.Unlock()
+	d.mu.Unlock()
 }
 
 // getNetworks Safely returns a slice of existing networks
 func (d *driver) getNetworks() []*network {
-	d.Lock()
-	defer d.Unlock()
+	d.mu.Lock()
+	defer d.mu.Unlock()
 
 	ls := make([]*network, 0, len(d.networks))
 	for _, nw := range d.networks {
@@ -50,8 +50,8 @@ func (n *network) endpoint(eid string) (*endpoint, error) {
 	if eid == "" {
 		return nil, errors.New("invalid endpoint id")
 	}
-	n.Lock()
-	defer n.Unlock()
+	n.mu.Lock()
+	defer n.mu.Unlock()
 
 	ep, ok := n.endpoints[eid]
 	if !ok || ep == nil {
@@ -61,15 +61,15 @@ func (n *network) endpoint(eid string) (*endpoint, error) {
 }
 
 func (n *network) addEndpoint(ep *endpoint) {
-	n.Lock()
+	n.mu.Lock()
 	n.endpoints[ep.id] = ep
-	n.Unlock()
+	n.mu.Unlock()
 }
 
 func (n *network) deleteEndpoint(eid string) {
-	n.Lock()
+	n.mu.Lock()
 	delete(n.endpoints, eid)
-	n.Unlock()
+	n.mu.Unlock()
 }
 
 func validateID(nid, eid string) error {
@@ -83,14 +83,15 @@ func validateID(nid, eid string) error {
 }
 
 func (d *driver) getNetwork(id string) (*network, error) {
-	d.Lock()
-	defer d.Unlock()
 	if id == "" {
-		return nil, types.InvalidParameterErrorf("invalid network id: %s", id)
-	}
-	if nw, ok := d.networks[id]; ok {
-		return nw, nil
+		return nil, types.InvalidParameterErrorf("invalid network id")
 	}
 
-	return nil, types.NotFoundErrorf("network not found: %s", id)
+	d.mu.Lock()
+	defer d.mu.Unlock()
+	nw, ok := d.networks[id]
+	if !ok || nw == nil {
+		return nil, types.NotFoundErrorf("network not found: %s", id)
+	}
+	return nw, nil
 }