From: Christian Brauner Date: Fri, 19 Feb 2021 23:49:25 +0000 (+0100) Subject: cgroups: tweak return values X-Git-Tag: lxc-5.0.0~274^2~27 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a96be3c335961f255de4f629cba4bd384b75d39d;p=thirdparty%2Flxc.git cgroups: tweak return values Signed-off-by: Christian Brauner --- diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c index d41a8ed88..e451658a3 100644 --- a/src/lxc/cgroups/cgfsng.c +++ b/src/lxc/cgroups/cgfsng.c @@ -3327,11 +3327,11 @@ static int cg_hybrid_init(struct cgroup_ops *ops, bool relative, bool unprivileg else basecginfo = read_file_at(-EBADF, "/proc/self/cgroup", PROTECT_OPEN, 0); if (!basecginfo) - return ret_set_errno(-1, ENOMEM); + return ret_errno(ENOMEM); ret = get_existing_subsystems(&klist, &nlist); if (ret < 0) - return log_error_errno(-1, errno, "Failed to retrieve available legacy cgroup controllers"); + return syserrno(-errno, "Failed to retrieve available legacy cgroup controllers"); f = fopen("/proc/self/mountinfo", "re"); if (!f) @@ -3496,7 +3496,7 @@ static int __cgroup_init(struct cgroup_ops *ops, struct lxc_conf *conf) const char *controllers_use; if (ops->dfd_mnt_cgroupfs_host >= 0) - return ret_errno(EINVAL); + return ret_errno(EBUSY); /* * I don't see the need for allowing symlinks here. If users want to