From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 8 Jun 2021 15:00:48 +0000 (+0200)
Subject: bpf-link: prefix function names with "bpf_"
X-Git-Tag: v249-rc1~57^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d63a3d350f2e5b8bdcbd4eb6b042d61859705ac0;p=thirdparty%2Fsystemd.git

bpf-link: prefix function names with "bpf_"

we generally do this for all bpf functions, do so here too.
---

diff --git a/src/core/bpf-socket-bind.c b/src/core/bpf-socket-bind.c
index 0ef3b6e568d..66c82d54699 100644
--- a/src/core/bpf-socket-bind.c
+++ b/src/core/bpf-socket-bind.c
@@ -140,7 +140,7 @@ int bpf_socket_bind_supported(void) {
                 return false;
         }
 
-        return can_link_bpf_program(obj->progs.sd_bind4);
+        return bpf_can_link_program(obj->progs.sd_bind4);
 }
 
 int bpf_socket_bind_add_initial_link_fd(Unit *u, int fd) {
@@ -226,11 +226,11 @@ int bpf_serialize_socket_bind(Unit *u, FILE *f, FDSet *fds) {
 
         assert(u);
 
-        r = serialize_bpf_link(f, fds, "ipv4-socket-bind-bpf-link", u->ipv4_socket_bind_link);
+        r = bpf_serialize_link(f, fds, "ipv4-socket-bind-bpf-link", u->ipv4_socket_bind_link);
         if (r < 0)
                 return r;
 
-        return serialize_bpf_link(f, fds, "ipv6-socket-bind-bpf-link", u->ipv6_socket_bind_link);
+        return bpf_serialize_link(f, fds, "ipv6-socket-bind-bpf-link", u->ipv6_socket_bind_link);
 }
 
 #else /* ! BPF_FRAMEWORK */
diff --git a/src/shared/bpf-link.c b/src/shared/bpf-link.c
index 5b4708e6b47..720ed40395b 100644
--- a/src/shared/bpf-link.c
+++ b/src/shared/bpf-link.c
@@ -4,7 +4,7 @@
 #include "bpf-link.h"
 #include "serialize.h"
 
-bool can_link_bpf_program(struct bpf_program *prog) {
+bool bpf_can_link_program(struct bpf_program *prog) {
         _cleanup_(bpf_link_freep) struct bpf_link *link = NULL;
 
         assert(prog);
@@ -19,7 +19,7 @@ bool can_link_bpf_program(struct bpf_program *prog) {
         return sym_libbpf_get_error(link) == -EBADF;
 }
 
-int serialize_bpf_link(FILE *f, FDSet *fds, const char *key, struct bpf_link *link) {
+int bpf_serialize_link(FILE *f, FDSet *fds, const char *key, struct bpf_link *link) {
         assert(key);
 
         if (!link)
diff --git a/src/shared/bpf-link.h b/src/shared/bpf-link.h
index 095465b07ce..bb6ac60ac9f 100644
--- a/src/shared/bpf-link.h
+++ b/src/shared/bpf-link.h
@@ -8,9 +8,9 @@
 #include "fdset.h"
 #include "macro.h"
 
-bool can_link_bpf_program(struct bpf_program *prog);
+bool bpf_can_link_program(struct bpf_program *prog);
 
-int serialize_bpf_link(FILE *f, FDSet *fds, const char *key, struct bpf_link *link);
+int bpf_serialize_link(FILE *f, FDSet *fds, const char *key, struct bpf_link *link);
 
 struct bpf_link *bpf_link_free(struct bpf_link *p);
 DEFINE_TRIVIAL_CLEANUP_FUNC(struct bpf_link *, bpf_link_free);