0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

libnetwork/osl: rename var that collided with import

Browse source 
Also renaming another var for consistency ':-)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2023-04-28 00:31:23 +02:00
parent 3a4158e4fa
commit 021e89d702
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libnetwork/osl/namespace_linux.go
View file

@ -600,29 +600,29 @@ func (n *networkNamespace) checkLoV6() {
}
func setIPv6(nspath, iface string, enable bool) error {
origns, err := netns.Get()
origNS, err := netns.Get()
if err != nil {
return fmt.Errorf("failed to get current network namespace: %w", err)
}
defer origns.Close()
defer origNS.Close()
ns, err := netns.GetFromPath(nspath)
namespace, err := netns.GetFromPath(nspath)
if err != nil {
return fmt.Errorf("failed get network namespace %q: %w", nspath, err)
}
defer ns.Close()
defer namespace.Close()
errCh := make(chan error, 1)
go func() {
defer close(errCh)
runtime.LockOSThread()
if err = netns.Set(ns); err != nil {
if err = netns.Set(namespace); err != nil {
errCh <- fmt.Errorf("setting into container netns %q failed: %w", nspath, err)
return
}
defer func() {
if err := netns.Set(origns); err != nil {
if err := netns.Set(origNS); err != nil {
logrus.WithError(err).Error("libnetwork: restoring thread network namespace failed")
// The error is only fatal for the current thread. Keep this
// goroutine locked to the thread to make the runtime replace it