From eff692502b8607c7fc409a18c53d2d4e8210726a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 4 Jan 2022 21:34:21 +0100 Subject: [PATCH] network: move logging from ipoib_set_netlink_message() to the caller --- src/network/netdev/ipoib.c | 14 +++++++------- src/network/networkd-setlink.c | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/network/netdev/ipoib.c b/src/network/netdev/ipoib.c index 630488cda9..0e27f5f044 100644 --- a/src/network/netdev/ipoib.c +++ b/src/network/netdev/ipoib.c @@ -66,35 +66,35 @@ int ipoib_set_netlink_message(Link *link, sd_netlink_message *m) { r = sd_netlink_message_set_flags(m, NLM_F_REQUEST | NLM_F_ACK); if (r < 0) - return log_link_debug_errno(link, r, "Could not set netlink flags: %m"); + return r; r = sd_netlink_message_open_container(m, IFLA_LINKINFO); if (r < 0) - return log_link_debug_errno(link, r, "Failed to open IFLA_LINKINFO container: %m"); + return r; r = sd_netlink_message_open_container_union(m, IFLA_INFO_DATA, link->kind); if (r < 0) - return log_link_debug_errno(link, r, "Could not open IFLA_INFO_DATA container: %m"); + return r; if (link->network->ipoib_mode >= 0) { r = sd_netlink_message_append_u16(m, IFLA_IPOIB_MODE, link->network->ipoib_mode); if (r < 0) - return log_link_debug_errno(link, r, "Could not append IFLA_IPOIB_MODE attribute: %m"); + return r; } if (link->network->ipoib_umcast >= 0) { r = sd_netlink_message_append_u16(m, IFLA_IPOIB_UMCAST, link->network->ipoib_umcast); if (r < 0) - return log_link_debug_errno(link, r, "Could not append IFLA_IPOIB_UMCAST attribute: %m"); + return r; } r = sd_netlink_message_close_container(m); if (r < 0) - return log_link_debug_errno(link, r, "Failed to close IFLA_INFO_DATA container: %m"); + return r; r = sd_netlink_message_close_container(m); if (r < 0) - return log_link_debug_errno(link, r, "Failed to close IFLA_LINKINFO container: %m"); + return r; return 0; } diff --git a/src/network/networkd-setlink.c b/src/network/networkd-setlink.c index b9fd1d749e..2fcca1f5c0 100644 --- a/src/network/networkd-setlink.c +++ b/src/network/networkd-setlink.c @@ -476,7 +476,7 @@ static int link_configure( case SET_LINK_IPOIB: r = ipoib_set_netlink_message(link, req); if (r < 0) - return r; + return log_link_debug_errno(link, r, "Could not create netlink message: %m"); break; case SET_LINK_MASTER: r = sd_netlink_message_append_u32(req, IFLA_MASTER, PTR_TO_UINT32(userdata));