Merge pull request #4039 from tych0/config-no-container-dir

api: ->save_config() doesn't need to create container dir

diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c
index cc96339579a4ee281ffd73865d932adbaf22e2e1..23b6af1af23a588fd44d404138b8d920217c1d47 100644 (file)
--- a/src/lxc/cgroups/cgfsng.c
+++ b/src/lxc/cgroups/cgfsng.c
@@ -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);