From 39335dd7c9f849d29dc501ca3f0f4745dde36e05 Mon Sep 17 00:00:00 2001 From: Kang Chen Date: Fri, 20 May 2022 14:33:59 +0800 Subject: [PATCH] libct/cg/sd: check dbus.ErrClosed instead of isDbusError Signed-off-by: Kang Chen --- libcontainer/cgroups/systemd/dbus.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libcontainer/cgroups/systemd/dbus.go b/libcontainer/cgroups/systemd/dbus.go index 3e547e282b5..96e3167ddaf 100644 --- a/libcontainer/cgroups/systemd/dbus.go +++ b/libcontainer/cgroups/systemd/dbus.go @@ -80,8 +80,6 @@ func (d *dbusConnManager) resetConnection(conn *systemdDbus.Conn) { } } -var errDbusConnClosed = dbus.ErrClosed.Error() - // retryOnDisconnect calls op, and if the error it returns is about closed dbus // connection, the connection is re-established and the op is retried. This helps // with the situation when dbus is restarted and we have a stale connection. @@ -92,7 +90,7 @@ func (d *dbusConnManager) retryOnDisconnect(op func(*systemdDbus.Conn) error) er return err } err = op(conn) - if !isDbusError(err, errDbusConnClosed) { + if err != dbus.ErrClosed { return err } d.resetConnection(conn)