From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Thu, 18 Feb 2021 09:17:21 +0000 (+0100)
Subject: bpf: use return macros
X-Git-Tag: lxc-5.0.0~278^2~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bee6ee17b0c7bf48f277137944d4581e27783f12;p=thirdparty%2Flxc.git

bpf: use return macros

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

diff --git a/src/lxc/cgroups/cgroup2_devices.h b/src/lxc/cgroups/cgroup2_devices.h
index 40ae1ed64..56eea75a8 100644
--- a/src/lxc/cgroups/cgroup2_devices.h
+++ b/src/lxc/cgroups/cgroup2_devices.h
@@ -19,6 +19,7 @@
 #include "compiler.h"
 #include "conf.h"
 #include "config.h"
+#include "macro.h"
 #include "memory_utils.h"
 #include "syscall_numbers.h"
 
@@ -72,41 +73,36 @@ __hidden extern int bpf_list_add_device(struct lxc_conf *conf, struct device_ite
 
 static inline struct bpf_program *bpf_program_new(uint32_t prog_type)
 {
-	errno = ENOSYS;
-	return NULL;
+	return ret_set_errno(NULL, ENOSYS);
 }
 
 static inline int bpf_program_init(struct bpf_program *prog)
 {
-	errno = ENOSYS;
-	return -1;
+	return ret_errno(ENOSYS);
 }
 
 static inline int bpf_program_append_device(struct bpf_program *prog, char type,
 					    int major, int minor,
 					    const char *access, int allow)
 {
-	errno = ENOSYS;
-	return -1;
+	return ret_errno(ENOSYS);
 }
 
 static inline int bpf_program_finalize(struct bpf_program *prog)
 {
-	errno = ENOSYS;
-	return -1;
+	return ret_errno(ENOSYS);
 }
 
 static inline int bpf_program_cgroup_attach(struct bpf_program *prog, int type,
-					    const char *path, uint32_t flags)
+					    int fd_cgroup, int replace_bpf_fd,
+					    uint32_t flags)
 {
-	errno = ENOSYS;
-	return -1;
+	return ret_errno(ENOSYS);
 }
 
 static inline int bpf_program_cgroup_detach(struct bpf_program *prog)
 {
-	errno = ENOSYS;
-	return -1;
+	return ret_errno(ENOSYS);
 }
 
 static inline void bpf_program_free(struct bpf_program *prog)
@@ -119,14 +115,13 @@ static inline void bpf_device_program_free(struct cgroup_ops *ops)
 
 static inline bool bpf_devices_cgroup_supported(void)
 {
-	return false;
+	return ret_set_errno(false, ENOSYS);
 }
 
 static inline int bpf_list_add_device(struct lxc_conf *conf,
 				      struct device_item *device)
 {
-	errno = ENOSYS;
-	return -1;
+	return ret_errno(ENOSYS);
 }
 #endif /* !HAVE_STRUCT_BPF_CGROUP_DEV_CTX */