diff mbox series

samples: bpf: fix style in bpf_load

Message ID 20190506130310.12803-1-danieltimlee@gmail.com
State Changes Requested
Delegated to: BPF Maintainers
Headers show
Series samples: bpf: fix style in bpf_load | expand

Commit Message

Daniel T. Lee May 6, 2019, 1:03 p.m. UTC 
This commit fixes style problem in samples/bpf/bpf_load.c

Styles that have been changed are:
 - 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>
---
 samples/bpf/bpf_load.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

Comments

Alexei Starovoitov May 9, 2019, 8:49 p.m. UTC | #1 
On Mon, May 6, 2019 at 6:03 AM Daniel T. Lee <danieltimlee@gmail.com> wrote:
>
> This commit fixes style problem in samples/bpf/bpf_load.c
>
> Styles that have been changed are:
>  - 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>

bpf-next is closed. Pls resubmit in about 2 weeks
or watch for 'bpf-next is open' email.
diff mbox series

Patch

diff --git a/samples/bpf/bpf_load.c b/samples/bpf/bpf_load.c
index eae7b635343d..e71d23d2a0ff 100644
--- a/samples/bpf/bpf_load.c
+++ b/samples/bpf/bpf_load.c
@@ -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)
 {
@@ -57,6 +57,7 @@  static int populate_prog_array(const char *event, int prog_fd)
 static int write_kprobe_events(const char *val)
 {
 	int fd, ret, flags;
+	char buf[256];
 
 	if (val == NULL)
 		return -1;
@@ -65,7 +66,9 @@  static int write_kprobe_events(const char *val)
 	else
 		flags = O_WRONLY | O_APPEND;
 
-	fd = open("/sys/kernel/debug/tracing/kprobe_events", flags);
+	strcpy(buf, DEBUGFS);
+	strcat(buf, "kprobe_events");
+	fd = open(buf, flags);
 
 	ret = write(fd, val, strlen(val));
 	close(fd);
@@ -490,8 +493,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);