Re: [PATCH net-next v1] bpf: Remove redundant ifdef

From: Wangnan (F)
Date: Tue Feb 14 2017 - 19:54:44 EST

On 2017/2/15 1:07, David Miller wrote:
From: "Wangnan (F)" <wangnan0@xxxxxxxxxx>
Date: Mon, 13 Feb 2017 09:53:49 +0800

On 2017/2/12 3:37, MickaÃl SalaÃn wrote:
Remove a useless ifdef __NR_bpf as requested by Wang Nan.

Inline one-line static functions as it was in the bpf_sys.h file.

Signed-off-by: MickaÃl SalaÃn <mic@xxxxxxxxxxx>
Cc: Alexei Starovoitov <ast@xxxxxx>
Cc: Daniel Borkmann <daniel@xxxxxxxxxxxxx>
Cc: David S. Miller <davem@xxxxxxxxxxxxx>
Cc: Wang Nan <wangnan0@xxxxxxxxxx>
tools/lib/bpf/bpf.c | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/tools/lib/bpf/bpf.c b/tools/lib/bpf/bpf.c
index 50e04cc5dddd..2de9c386989a 100644
--- a/tools/lib/bpf/bpf.c
+++ b/tools/lib/bpf/bpf.c
@@ -42,21 +42,15 @@
# endif
-static __u64 ptr_to_u64(const void *ptr)
+static inline __u64 ptr_to_u64(const void *ptr)
return (__u64) (unsigned long) ptr;
-static int sys_bpf(enum bpf_cmd cmd, union bpf_attr *attr,
- unsigned int size)
+static inline int sys_bpf(enum bpf_cmd cmd, union bpf_attr *attr,
+ unsigned int size)
-#ifdef __NR_bpf
return syscall(__NR_bpf, cmd, attr, size);
- fprintf(stderr, "No bpf syscall, kernel headers too old?\n");
- errno = ENOSYS;
- return -1;
int bpf_create_map(enum bpf_map_type map_type, int key_size,
Acked-by: Wang Nan <wangnan0@xxxxxxxxxx>

However, it is better to merge this patch with commit
I don't know where this commit ID is. Since this patch is targetting
net-next I would expect a commit ID with not context to be in that
tree. Please always specify where the commit ID you mention is.

It is "bpf: Remove bpf_sys.h from selftests" in net-next.

Futhermore, commits in net-next are permanent so it is not possible
afterwards to "merge this patch with commit X".

I understand. Maintainers sometime reset
his/her head to an early version and amend
the commit to make the history clean, but
clearly net-next never do this.

Thank you.