From: Wan Jiabing <wanjiabing@vivo.com>
Date: Thu, 1 Apr 2021 06:46:37 +0000 (+0800)
Subject: bpf, cgroup: Delete repeated struct bpf_prog declaration
X-Git-Tag: v5.13-rc1~94^2~46^2~29
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2daae89666ad253281bb3d6a027c00a702c02eff;p=thirdparty%2Fkernel%2Flinux.git

bpf, cgroup: Delete repeated struct bpf_prog declaration

struct bpf_prog is declared twice. There is one declaration which is
independent on the macro at 18th line. So the below one is not needed
though. Remove the duplicate.

Signed-off-by: Wan Jiabing <wanjiabing@vivo.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Song Liu <songliubraving@fb.com>
Link: https://lore.kernel.org/bpf/20210401064637.993327-1-wanjiabing@vivo.com
---

diff --git a/include/linux/bpf-cgroup.h b/include/linux/bpf-cgroup.h
index 6a29fe11485d0..8b77d08d4b47f 100644
--- a/include/linux/bpf-cgroup.h
+++ b/include/linux/bpf-cgroup.h
@@ -458,7 +458,6 @@ int cgroup_bpf_prog_query(const union bpf_attr *attr,
 			  union bpf_attr __user *uattr);
 #else
 
-struct bpf_prog;
 struct cgroup_bpf {};
 static inline int cgroup_bpf_inherit(struct cgroup *cgrp) { return 0; }
 static inline void cgroup_bpf_offline(struct cgroup *cgrp) {}