leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tools lib bpf: Rename bpf_map__get_fd() to bpf_map__fd()

Browse Source 
For consistency, leaving "get" for reference counting.

Acked-by: Wang Nan <wangnan0@huawei.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Milian Wolff <milian.wolff@kdab.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: http://lkml.kernel.org/n/tip-msy8sxfz9th6gl2xjeci2btm@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Arnaldo Carvalho de Melo
2016-06-03 12:15:52 -03:00
parent 53897a78ca
commit 6e009e65a1
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tools/lib/bpf/libbpf.c
View File

@@ -1311,12 +1311,9 @@ int bpf_program__nth_fd(struct bpf_program *prog, int n)
return fd; return fd;
} }
int bpf_map__get_fd(struct bpf_map *map) int bpf_map__fd(struct bpf_map *map)
{ {
if (!map) return map ? map->fd : -EINVAL;
return -EINVAL;
return map->fd;
} }
const struct bpf_map_def *bpf_map__def(struct bpf_map *map) const struct bpf_map_def *bpf_map__def(struct bpf_map *map)

2
tools/lib/bpf/libbpf.h
View File

@@ -180,7 +180,7 @@ bpf_map__next(struct bpf_map *map, struct bpf_object *obj);
(pos) != NULL; \ (pos) != NULL; \
(pos) = bpf_map__next((pos), (obj))) (pos) = bpf_map__next((pos), (obj)))
int bpf_map__get_fd(struct bpf_map *map); int bpf_map__fd(struct bpf_map *map);
const struct bpf_map_def *bpf_map__def(struct bpf_map *map); const struct bpf_map_def *bpf_map__def(struct bpf_map *map);
const char *bpf_map__name(struct bpf_map *map); const char *bpf_map__name(struct bpf_map *map);

2
tools/perf/util/bpf-loader.c
View File

@@ -1270,7 +1270,7 @@ bpf_map_config_foreach_key(struct bpf_map *map,
pr_debug("ERROR: failed to get definition from map %s\n", name); pr_debug("ERROR: failed to get definition from map %s\n", name);
return -BPF_LOADER_ERRNO__INTERNAL; return -BPF_LOADER_ERRNO__INTERNAL;
} }
map_fd = bpf_map__get_fd(map); map_fd = bpf_map__fd(map);
if (map_fd < 0) { if (map_fd < 0) {
pr_debug("ERROR: failed to get fd from map %s\n", name); pr_debug("ERROR: failed to get fd from map %s\n", name);
return map_fd; return map_fd;