From 618d9b5d54aeb23a2a972fe6961cfde2cd6c5bb2 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 16 Aug 2023 13:51:52 +0200 Subject: [PATCH] libnetwork: nwAgent: un-export mutex Signed-off-by: Sebastiaan van Stijn --- libnetwork/agent.go | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/libnetwork/agent.go b/libnetwork/agent.go index d893911829..f74731dab9 100644 --- a/libnetwork/agent.go +++ b/libnetwork/agent.go @@ -42,12 +42,12 @@ type nwAgent struct { dataPathAddr string coreCancelFuncs []func() driverCancelFuncs map[string][]func() - sync.Mutex + mu sync.Mutex } func (a *nwAgent) dataPathAddress() string { - a.Lock() - defer a.Unlock() + a.mu.Lock() + defer a.mu.Unlock() if a.dataPathAddr != "" { return a.dataPathAddr } @@ -416,14 +416,14 @@ func (c *Controller) agentClose() { var cancelList []func() - agent.Lock() + agent.mu.Lock() for _, cancelFuncs := range agent.driverCancelFuncs { cancelList = append(cancelList, cancelFuncs...) } // Add also the cancel functions for the network db cancelList = append(cancelList, agent.coreCancelFuncs...) - agent.Unlock() + agent.mu.Unlock() for _, cancel := range cancelList { cancel() @@ -773,9 +773,9 @@ func (n *Network) addDriverWatches() { c := n.getController() for _, table := range n.driverTables { ch, cancel := agent.networkDB.Watch(table.name, n.ID()) - agent.Lock() + agent.mu.Lock() agent.driverCancelFuncs[n.ID()] = append(agent.driverCancelFuncs[n.ID()], cancel) - agent.Unlock() + agent.mu.Unlock() go c.handleTableEvents(ch, n.handleDriverTableEvent) d, err := n.driver(false) if err != nil { @@ -803,10 +803,10 @@ func (n *Network) cancelDriverWatches() { return } - agent.Lock() + agent.mu.Lock() cancelFuncs := agent.driverCancelFuncs[n.ID()] delete(agent.driverCancelFuncs, n.ID()) - agent.Unlock() + agent.mu.Unlock() for _, cancel := range cancelFuncs { cancel()