Merge pull request #4040 from tych0/fix-cgroup-warning

cgroups: fix compiler warning
This commit is contained in:
Christian Brauner 2021-11-29 17:25:45 +01:00 committed by GitHub
commit 6a9cbecdaa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -574,7 +574,7 @@ __cgfsng_ops static void cgfsng_payload_destroy(struct cgroup_ops *ops,
static bool cpuset1_cpus_initialize(int dfd_parent, int dfd_child,
bool am_initialized)
{
__do_free char *cpulist = NULL, *fpath = NULL, *isolcpus = NULL,
__do_free char *cpulist = NULL, *isolcpus = NULL,
*offlinecpus = NULL, *posscpus = NULL;
__do_free __u32 *possmask = NULL;
int ret;
@ -582,7 +582,7 @@ static bool cpuset1_cpus_initialize(int dfd_parent, int dfd_child,
posscpus = read_file_at(dfd_parent, "cpuset.cpus", PROTECT_OPEN, 0);
if (!posscpus)
return log_error_errno(false, errno, "Failed to read file \"%s\"", fpath);
return log_error_errno(false, errno, "Failed to read file %d/cpuset.cpus", dfd_parent);
if (file_exists(__ISOL_CPUS)) {
isolcpus = read_file_at(-EBADF, __ISOL_CPUS, PROTECT_OPEN, 0);