[lxc-devel] [lxd/master] lxd/container: removes unused arg from network limits function

tomponline on Github lxc-bot at linuxcontainers.org
Tue Apr 16 16:11:38 UTC 2019


A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 357 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20190416/3f433ec9/attachment.bin>
-------------- next part --------------
From 9700656de37db480530e5cd23f20cab5b3c9e782 Mon Sep 17 00:00:00 2001
From: tomponline <thomas.parrott at canonical.com>
Date: Tue, 16 Apr 2019 17:10:48 +0100
Subject: [PATCH] lxd/container: removes unused arg from network limits
 function

Signed-off-by: tomponline <thomas.parrott at canonical.com>
---
 lxd/container_lxc.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lxd/container_lxc.go b/lxd/container_lxc.go
index 6bcea40ae4..ea01370731 100644
--- a/lxd/container_lxc.go
+++ b/lxd/container_lxc.go
@@ -3015,7 +3015,7 @@ func (c *containerLXC) OnStop(target string) error {
 func (c *containerLXC) OnNetworkUp(deviceName string, hostName string) error {
 	device := c.expandedDevices[deviceName]
 	device["host_name"] = hostName
-	return c.setNetworkLimits(deviceName, device)
+	return c.setNetworkLimits(device)
 }
 
 // Freezer functions
@@ -4855,7 +4855,7 @@ func (c *containerLXC) Update(args db.ContainerArgs, userRequested bool) error {
 				if needsUpdate {
 					// Refresh tc limits
 					m["host_name"] = c.getHostInterface(m["name"])
-					err = c.setNetworkLimits(k, m)
+					err = c.setNetworkLimits(m)
 					if err != nil {
 						return err
 					}
@@ -8584,7 +8584,7 @@ func (c *containerLXC) getHostInterface(name string) string {
 	return ""
 }
 
-func (c *containerLXC) setNetworkLimits(name string, m types.Device) error {
+func (c *containerLXC) setNetworkLimits(m types.Device) error {
 	var err error
 	// We can only do limits on some network type
 	if m["nictype"] != "bridged" && m["nictype"] != "p2p" {


More information about the lxc-devel mailing list