tree-wide: replace remaining instances of syserrno() with syserror_ret()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c
index a8f53de5d8414a66edddca884b14e477b43d8b7d..69ac3dc8d7027051cfb10ae23ee3b065aef53f01 100644 (file)
--- a/src/lxc/cgroups/cgfsng.c
+++ b/src/lxc/cgroups/cgfsng.c
@@ -685,29 +685,29 @@ static bool cpuset1_initialize(int dfd_base, int dfd_next)
         */
        bytes = lxc_readat(dfd_base, "cgroup.clone_children", &v, 1);
        if (bytes < 0)
-               return syserrno(false, "Failed to read file %d(cgroup.clone_children)", dfd_base);
+               return syserror_ret(false, "Failed to read file %d(cgroup.clone_children)", dfd_base);
 
        /*
        * Initialize cpuset.cpus and make remove any isolated
        * and offline cpus.
         */
        if (!cpuset1_cpus_initialize(dfd_base, dfd_next, v == '1'))
-               return syserrno(false, "Failed to initialize cpuset.cpus");
+               return syserror_ret(false, "Failed to initialize cpuset.cpus");
 
        /* Read cpuset.mems from parent... */
        bytes = lxc_readat(dfd_base, "cpuset.mems", mems, sizeof(mems));
        if (bytes < 0)
-               return syserrno(false, "Failed to read file %d(cpuset.mems)", dfd_base);
+               return syserror_ret(false, "Failed to read file %d(cpuset.mems)", dfd_base);
 
        /* ... and copy to first cgroup in the tree... */
        bytes = lxc_writeat(dfd_next, "cpuset.mems", mems, bytes);
        if (bytes < 0)
-               return syserrno(false, "Failed to write %d(cpuset.mems)", dfd_next);
+               return syserror_ret(false, "Failed to write %d(cpuset.mems)", dfd_next);
 
        /* ... and finally turn on cpuset inheritance. */
        bytes = lxc_writeat(dfd_next, "cgroup.clone_children", "1", 1);
        if (bytes < 0)
-               return syserrno(false, "Failed to write %d(cgroup.clone_children)", dfd_next);
+               return syserror_ret(false, "Failed to write %d(cgroup.clone_children)", dfd_next);
 
        return log_trace(true, "Initialized cpuset in the legacy hierarchy");
 }
@@ -792,7 +792,7 @@ static bool cgroup_tree_create(struct cgroup_ops *ops, struct lxc_conf *conf,
                /* With isolation both parts need to not already exist. */
                fd_limit = __cgroup_tree_create(h->dfd_base, cgroup_limit_dir, 0755, cpuset_v1, false);
                if (fd_limit < 0)
-                       return syserrno(false, "Failed to create limiting cgroup %d(%s)", h->dfd_base, cgroup_limit_dir);
+                       return syserror_ret(false, "Failed to create limiting cgroup %d(%s)", h->dfd_base, cgroup_limit_dir);
 
                TRACE("Created limit cgroup %d->%d(%s)",
                      fd_limit, h->dfd_base, cgroup_limit_dir);
@@ -828,7 +828,7 @@ static bool cgroup_tree_create(struct cgroup_ops *ops, struct lxc_conf *conf,
                fd_final = __cgroup_tree_create(h->dfd_base, cgroup_limit_dir, 0755, cpuset_v1, false);
        }
        if (fd_final < 0)
-               return syserrno(false, "Failed to create %s cgroup %d(%s)", payload ? "payload" : "monitor", h->dfd_base, cgroup_limit_dir);
+               return syserror_ret(false, "Failed to create %s cgroup %d(%s)", payload ? "payload" : "monitor", h->dfd_base, cgroup_limit_dir);
 
        if (payload) {
                h->dfd_con = move_fd(fd_final);
@@ -1695,8 +1695,8 @@ __cgfsng_ops static bool cgfsng_mount(struct cgroup_ops *ops,
                dfd_mnt_unified = open_at(rootfs->dfd_mnt, DEFAULT_CGROUP_MOUNTPOINT_RELATIVE,
                                          PROTECT_OPATH_DIRECTORY, PROTECT_LOOKUP_BENEATH_XDEV, 0);
                if (dfd_mnt_unified < 0)
-                       return syserrno(false, "Failed to open %d(%s)", rootfs->dfd_mnt,
-                                       DEFAULT_CGROUP_MOUNTPOINT_RELATIVE);
+                       return syserror_ret(false, "Failed to open %d(%s)",
+                                           rootfs->dfd_mnt, DEFAULT_CGROUP_MOUNTPOINT_RELATIVE);
                /*
                 * If cgroup namespaces are supported but the container will
                 * not have CAP_SYS_ADMIN after it has started we need to mount
@@ -1729,7 +1729,7 @@ __cgfsng_ops static bool cgfsng_mount(struct cgroup_ops *ops,
                         */
                        ret = cgroupfs_mount(cgroup_automount_type, ops->unified, rootfs, dfd_mnt_unified, "");
                        if (ret < 0)
-                               return syserrno(false, "Failed to force mount cgroup filesystem in cgroup namespace");
+                               return syserror_ret(false, "Failed to force mount cgroup filesystem in cgroup namespace");
 
                        return log_trace(true, "Force mounted cgroup filesystem in new cgroup namespace");
                } else {
@@ -1760,7 +1760,7 @@ __cgfsng_ops static bool cgfsng_mount(struct cgroup_ops *ops,
                        }
                }
 
-               return syserrno(false, "Failed to mount cgroups");
+               return syserror_ret(false, "Failed to mount cgroups");
        }
 
        /*
@@ -1798,8 +1798,8 @@ __cgfsng_ops static bool cgfsng_mount(struct cgroup_ops *ops,
        dfd_mnt_tmpfs = open_at(rootfs->dfd_mnt, DEFAULT_CGROUP_MOUNTPOINT_RELATIVE,
                                PROTECT_OPATH_DIRECTORY, PROTECT_LOOKUP_BENEATH_XDEV, 0);
        if (dfd_mnt_tmpfs < 0)
-               return syserrno(false, "Failed to open %d(%s)", rootfs->dfd_mnt,
-                               DEFAULT_CGROUP_MOUNTPOINT_RELATIVE);
+               return syserror_ret(false, "Failed to open %d(%s)",
+                                   rootfs->dfd_mnt, DEFAULT_CGROUP_MOUNTPOINT_RELATIVE);
 
        for (int i = 0; ops->hierarchies[i]; i++) {
                __do_free char *hierarchy_mnt = NULL, *path2 = NULL;
@@ -1807,7 +1807,7 @@ __cgfsng_ops static bool cgfsng_mount(struct cgroup_ops *ops,
 
                ret = mkdirat(dfd_mnt_tmpfs, h->at_mnt, 0000);
                if (ret < 0)
-                       return syserrno(false, "Failed to create cgroup at_mnt %d(%s)", dfd_mnt_tmpfs, h->at_mnt);
+                       return syserror_ret(false, "Failed to create cgroup at_mnt %d(%s)", dfd_mnt_tmpfs, h->at_mnt);
 
                if (in_cgroup_ns && wants_force_mount) {
                        /*
@@ -3057,7 +3057,7 @@ static bool unified_hierarchy_delegated(int dfd_base, char ***ret_files)
 
        ret = __list_cgroup_delegate(&list);
        if (ret < 0)
-               return syserrno(ret, "Failed to determine unified cgroup delegation requirements");
+               return syserror_ret(ret, "Failed to determine unified cgroup delegation requirements");
 
        for (char *const *s = list; s && *s; s++) {
                if (!faccessat(dfd_base, *s, W_OK, 0) || errno == ENOENT)
@@ -3234,7 +3234,7 @@ static int __initialize_cgroups(struct cgroup_ops *ops, bool relative,
                ret = cgroup_hierarchy_add(ops, dfd_mnt, controllers, dfd,
                                           current_cgroup, controller_list, type);
                if (ret < 0)
-                       return syserrno(ret, "Failed to add %s hierarchy", controllers);
+                       return syserror_ret(ret, "Failed to add %s hierarchy", controllers);
 
                /* Transfer ownership. */
                move_fd(dfd_mnt);
@@ -3307,7 +3307,7 @@ static int initialize_cgroups(struct cgroup_ops *ops, struct lxc_conf *conf)
 
        ret = __initialize_cgroups(ops, conf->cgroup_meta.relative, !lxc_list_empty(&conf->id_map));
        if (ret < 0)
-               return syserrno(ret, "Failed to initialize cgroups");
+               return syserror_ret(ret, "Failed to initialize cgroups");
 
        /* Transfer ownership to cgroup_ops. */
        move_fd(dfd);
@@ -3430,7 +3430,7 @@ static int __cgroup_attach_many(const struct lxc_conf *conf, const char *name,
                else
                        ret = lxc_writeat(dfd_con, "cgroup.procs", pidstr, pidstr_len);
                if (ret)
-                       return syserrno(ret, "Failed to attach to cgroup fd %d", dfd_con);
+                       return syserror_ret(ret, "Failed to attach to cgroup fd %d", dfd_con);
                else
                        TRACE("Attached to cgroup fd %d", dfd_con);
        }

diff --git a/src/lxc/cgroups/cgroup2_devices.c b/src/lxc/cgroups/cgroup2_devices.c
index 88d581f9994fc1cd4875c5fbb961517725bc8c19..47ffd18bc8a5b44a18f32c3cd3b2ee61ae4a53e6 100644 (file)
--- a/src/lxc/cgroups/cgroup2_devices.c
+++ b/src/lxc/cgroups/cgroup2_devices.c
@@ -565,11 +565,11 @@ static struct bpf_program *__bpf_cgroup_devices(struct bpf_devices *bpf_devices)
 
        prog = bpf_program_new(BPF_PROG_TYPE_CGROUP_DEVICE);
        if (!prog)
-               return syserrno(NULL, "Failed to create new bpf program");
+               return syserror_ret(NULL, "Failed to create new bpf program");
 
        ret = bpf_program_init(prog);
        if (ret)
-               return syserrno(NULL, "Failed to initialize bpf program");
+               return syserror_ret(NULL, "Failed to initialize bpf program");
 
        prog->device_list_type = bpf_devices->list_type;
        TRACE("Device cgroup %s all devices by default",
@@ -586,14 +586,14 @@ static struct bpf_program *__bpf_cgroup_devices(struct bpf_devices *bpf_devices)
 
                ret = bpf_program_append_device(prog, cur);
                if (ret)
-                       return syserrno(NULL, "Failed adding new device rule");
+                       return syserror_ret(NULL, "Failed adding new device rule");
 
                TRACE("Added new device rule");
        }
 
        ret = bpf_program_finalize(prog);
        if (ret)
-               return syserrno(NULL, "Failed to finalize device program");
+               return syserror_ret(NULL, "Failed to finalize device program");
 
        return move_ptr(prog);
 }
@@ -606,13 +606,13 @@ bool bpf_cgroup_devices_attach(struct cgroup_ops *ops,
 
        prog = __bpf_cgroup_devices(bpf_devices);
        if (!prog)
-               return syserrno(false, "Failed to create bpf program");
+               return syserror_ret(false, "Failed to create bpf program");
 
        ret = bpf_program_cgroup_attach(prog, BPF_CGROUP_DEVICE,
                                        ops->unified->dfd_lim,
                                        BPF_F_ALLOW_MULTI);
        if (ret)
-               return syserrno(false, "Failed to attach bpf program");
+               return syserror_ret(false, "Failed to attach bpf program");
 
        /* Replace old bpf program. */
        swap(prog, ops->cgroup2_devices);
@@ -657,11 +657,11 @@ bool bpf_cgroup_devices_update(struct cgroup_ops *ops,
 
        prog = __bpf_cgroup_devices(bpf_devices);
        if (!prog)
-               return syserrno(false, "Failed to create bpf program");
+               return syserror_ret(false, "Failed to create bpf program");
 
        ret = bpf_program_load_kernel(prog);
        if (ret < 0)
-               return syserrno(false, "Failed to load bpf program");
+               return syserror_ret(false, "Failed to load bpf program");
 
        attr = &(union bpf_attr){
                .attach_type    = prog_old->attached_type,
@@ -693,7 +693,7 @@ bool bpf_cgroup_devices_update(struct cgroup_ops *ops,
                break;
        }
        if (ret < 0)
-               return syserrno(false, "Failed to update bpf program");
+               return syserror_ret(false, "Failed to update bpf program");
 
        if (can_use_bpf_replace > 0) {
                /* The old program was automatically detached by the kernel. */

diff --git a/src/lxc/commands.c b/src/lxc/commands.c
index ed4343d420a37dc32e49a529aa66c0be7d0cddca..fd554bff48c662fb13f7e3297f0d6850bf447cff 100644 (file)
--- a/src/lxc/commands.c
+++ b/src/lxc/commands.c
@@ -326,7 +326,7 @@ static ssize_t lxc_cmd_rsp_recv(int sock, struct lxc_cmd_rr *cmd)
                        err = 0;
                }
                if (err < 0)
-                       return syserrno(err, "Failed to transfer file descriptors for command \"%s\"", cur_cmdstr);
+                       return syserror_ret(err, "Failed to transfer file descriptors for command \"%s\"", cur_cmdstr);
        }
 
        move_ptr(__data);

diff --git a/src/lxc/log.h b/src/lxc/log.h
index 6517c8156d63f7bfb254d4b0aaec9ac54f7d65bc..9452e63f2325170536959a3771ee1c01f57ade21 100644 (file)
--- a/src/lxc/log.h
+++ b/src/lxc/log.h
@@ -494,13 +494,6 @@ __lxc_unused static inline void LXC_##LEVEL(struct lxc_log_locinfo* locinfo,       \
                __internal_ret__;                             \
        })
 
-#define syserrno(__ret__, format, ...)                        \
-       ({                                                    \
-               typeof(__ret__) __internal_ret__ = (__ret__); \
-               SYSERROR(format, ##__VA_ARGS__);              \
-               __internal_ret__;                             \
-       })
-
 #define syswarn(__ret__, format, ...)                         \
        ({                                                    \
                typeof(__ret__) __internal_ret__ = (__ret__); \
@@ -544,6 +537,13 @@ __lxc_unused static inline void LXC_##LEVEL(struct lxc_log_locinfo* locinfo,       \
                __internal_ret__;                             \
        })
 
+#define syserror_ret(__ret__, format, ...)                    \
+       ({                                                    \
+               typeof(__ret__) __internal_ret__ = (__ret__); \
+               SYSERROR(format, ##__VA_ARGS__);              \
+               __internal_ret__;                             \
+       })
+
 #define sysdebug(format, ...)                    \
        ({                                       \
                SYSDEBUG(format, ##__VA_ARGS__); \