From 508a0979d9e3a15361d4b936252111796c0580d3 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sat, 31 Oct 2020 17:59:46 +0100 Subject: [PATCH] bridge: remove unused "others" argument from isolateNetwork() This argument was used to detect conflicts, but was later removed in 1c73b1c99c14d7f048a2318a3caf589865c76fad. However, it was never removed, and we were still getting a list of all networks, without using the results. Signed-off-by: Sebastiaan van Stijn --- libnetwork/drivers/bridge/bridge.go | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/libnetwork/drivers/bridge/bridge.go b/libnetwork/drivers/bridge/bridge.go index 925690847b..835ab55258 100644 --- a/libnetwork/drivers/bridge/bridge.go +++ b/libnetwork/drivers/bridge/bridge.go @@ -324,7 +324,7 @@ func (n *bridgeNetwork) getEndpoint(eid string) (*bridgeEndpoint, error) { // Install/Removes the iptables rules needed to isolate this network // from each of the other networks -func (n *bridgeNetwork) isolateNetwork(others []*bridgeNetwork, enable bool) error { +func (n *bridgeNetwork) isolateNetwork(enable bool) error { n.Lock() thisConfig := n.config n.Unlock() @@ -673,8 +673,6 @@ func (d *driver) checkConflict(config *networkConfiguration) error { func (d *driver) createNetwork(config *networkConfiguration) (err error) { defer osl.InitOSContext()() - networkList := d.getNetworks() - // Initialize handle when needed d.Lock() if d.nlh == nil { @@ -714,16 +712,15 @@ func (d *driver) createNetwork(config *networkConfiguration) (err error) { // Add inter-network communication rules. setupNetworkIsolationRules := func(config *networkConfiguration, i *bridgeInterface) error { - if err := network.isolateNetwork(networkList, true); err != nil { - if err = network.isolateNetwork(networkList, false); err != nil { + if err := network.isolateNetwork(true); err != nil { + if err = network.isolateNetwork(false); err != nil { logrus.Warnf("Failed on removing the inter-network iptables rules on cleanup: %v", err) } return err } // register the cleanup function network.registerIptCleanFunc(func() error { - nwList := d.getNetworks() - return network.isolateNetwork(nwList, false) + return network.isolateNetwork(false) }) return nil }