From 24548539af7fa95cd9ca7b971eb9f301065492e0 Mon Sep 17 00:00:00 2001 From: Christian Brauner Date: Fri, 15 Feb 2019 23:50:34 +0100 Subject: [PATCH] network: do not log false friends The netlink functions just return -1 and not specific negative errno values so logging them doesn't make any sense. Fixes: https://discuss.linuxcontainers.org/t/warning-in-the-container-log/4072/2 Signed-off-by: Christian Brauner --- src/lxc/network.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/lxc/network.c b/src/lxc/network.c index e05c56615..fd7d867fc 100644 --- a/src/lxc/network.c +++ b/src/lxc/network.c @@ -2581,10 +2581,9 @@ bool lxc_delete_network_priv(struct lxc_handler *handler) netdev->name[0] != '\0' ? netdev->name : "(null)", netdev->ifindex); } else if (ret < 0) { - errno = -ret; - SYSWARN("Failed to remove interface \"%s\" with index %d", - netdev->name[0] != '\0' ? netdev->name : "(null)", - netdev->ifindex); + WARN("Failed to remove interface \"%s\" with index %d", + netdev->name[0] != '\0' ? netdev->name : "(null)", + netdev->ifindex); goto clear_ifindices; } INFO("Removed interface \"%s\" with index %d", @@ -2606,9 +2605,8 @@ bool lxc_delete_network_priv(struct lxc_handler *handler) ret = lxc_netdev_delete_by_name(hostveth); if (ret < 0) { - errno = -ret; - SYSWARN("Failed to remove interface \"%s\" from \"%s\"", - hostveth, netdev->link); + WARN("Failed to remove interface \"%s\" from \"%s\"", + hostveth, netdev->link); goto clear_ifindices; } INFO("Removed interface \"%s\" from \"%s\"", hostveth, netdev->link); -- 2.39.5