Skip to content

Commit

Permalink
samples/bpf: fix a couple of style issues in bpf_load
Browse files Browse the repository at this point in the history
This commit fixes a few style problems in samples/bpf/bpf_load.c:

 - Magic string use of 'DEBUGFS'
 - Useless zero initialization of a global variable
 - Minor style fix with whitespace

Signed-off-by: Daniel T. Lee <danieltimlee@gmail.com>
Acked-by: Yonghong Song <yhs@fb.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
  • Loading branch information
DanielTimLee authored and borkmann committed May 28, 2019
1 parent 486d3f2 commit 37b54ae
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions samples/bpf/bpf_load.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ int prog_cnt;
int prog_array_fd = -1;

struct bpf_map_data map_data[MAX_MAPS];
int map_data_count = 0;
int map_data_count;

static int populate_prog_array(const char *event, int prog_fd)
{
Expand All @@ -65,7 +65,7 @@ static int write_kprobe_events(const char *val)
else
flags = O_WRONLY | O_APPEND;

fd = open("/sys/kernel/debug/tracing/kprobe_events", flags);
fd = open(DEBUGFS "kprobe_events", flags);

ret = write(fd, val, strlen(val));
close(fd);
Expand Down Expand Up @@ -490,8 +490,8 @@ static int load_elf_maps_section(struct bpf_map_data *maps, int maps_shndx,

/* Verify no newer features were requested */
if (validate_zero) {
addr = (unsigned char*) def + map_sz_copy;
end = (unsigned char*) def + map_sz_elf;
addr = (unsigned char *) def + map_sz_copy;
end = (unsigned char *) def + map_sz_elf;
for (; addr < end; addr++) {
if (*addr != 0) {
free(sym);
Expand Down

0 comments on commit 37b54ae

Please sign in to comment.