[Patch bpf-next v5 6/8] sock_map: make sock_map_prog_update() static

[Cong Wang]

From: Cong Wang <cong.w...@bytedance.com>

It is only used within sock_map.c so can become static.

Suggested-by: Jakub Sitnicki <ja...@cloudflare.com>
Cc: Daniel Borkmann <dan...@iogearbox.net>
Cc: Lorenz Bauer <l...@cloudflare.com>
Cc: John Fastabend <john.fastab...@gmail.com>
Signed-off-by: Cong Wang <cong.w...@bytedance.com>
---
 include/linux/bpf.h | 9 ---------
 net/core/sock_map.c | 7 +++++--
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/include/linux/bpf.h b/include/linux/bpf.h
index e29600f01585..9b31893f1b32 100644
--- a/include/linux/bpf.h
+++ b/include/linux/bpf.h
@@ -1742,8 +1742,6 @@ static inline bool bpf_map_is_dev_bound(struct bpf_map 
*map)
 struct bpf_map *bpf_map_offload_map_alloc(union bpf_attr *attr);
 void bpf_map_offload_map_free(struct bpf_map *map);
 
-int sock_map_prog_update(struct bpf_map *map, struct bpf_prog *prog,
-                        struct bpf_prog *old, u32 which);
 int sock_map_get_from_fd(const union bpf_attr *attr, struct bpf_prog *prog);
 int sock_map_prog_detach(const union bpf_attr *attr, enum bpf_prog_type ptype);
 int sock_map_update_elem_sys(struct bpf_map *map, void *key, void *value, u64 
flags);
@@ -1775,13 +1773,6 @@ static inline void bpf_map_offload_map_free(struct 
bpf_map *map)
 {
 }
 
-static inline int sock_map_prog_update(struct bpf_map *map,
-                                      struct bpf_prog *prog,
-                                      struct bpf_prog *old, u32 which)
-{
-       return -EOPNOTSUPP;
-}
-
 static inline int sock_map_get_from_fd(const union bpf_attr *attr,
                                       struct bpf_prog *prog)
 {
diff --git a/net/core/sock_map.c b/net/core/sock_map.c
index 69785070f02d..dd53a7771d7e 100644
--- a/net/core/sock_map.c
+++ b/net/core/sock_map.c
@@ -24,6 +24,9 @@ struct bpf_stab {
 #define SOCK_CREATE_FLAG_MASK                          \
        (BPF_F_NUMA_NODE | BPF_F_RDONLY | BPF_F_WRONLY)
 
+static int sock_map_prog_update(struct bpf_map *map, struct bpf_prog *prog,
+                               struct bpf_prog *old, u32 which);
+
 static struct bpf_map *sock_map_alloc(union bpf_attr *attr)
 {
        struct bpf_stab *stab;
@@ -1444,8 +1447,8 @@ static struct sk_psock_progs *sock_map_progs(struct 
bpf_map *map)
        return NULL;
 }
 
-int sock_map_prog_update(struct bpf_map *map, struct bpf_prog *prog,
-                        struct bpf_prog *old, u32 which)
+static int sock_map_prog_update(struct bpf_map *map, struct bpf_prog *prog,
+                               struct bpf_prog *old, u32 which)
 {
        struct sk_psock_progs *progs = sock_map_progs(map);
        struct bpf_prog **pprog;
-- 
2.25.1