Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6e009e65 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

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



For consistency, leaving "get" for reference counting.

Acked-by: default avatarWang 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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 53897a78

tools/lib/bpf/libbpf.c

+2 −5
Original line number Diff line number Diff line
@@ -1311,12 +1311,9 @@ int bpf_program__nth_fd(struct bpf_program *prog, int n) 
	return fd;

}



int bpf_map__get_fd(struct bpf_map *map)

int bpf_map__fd(struct bpf_map *map)

{

	if (!map)

		return -EINVAL;



	return map->fd;

	return map ? map->fd : -EINVAL;

}



const struct bpf_map_def *bpf_map__def(struct bpf_map *map)

tools/lib/bpf/libbpf.h

+1 −1
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ bpf_map__next(struct bpf_map *map, struct bpf_object *obj); 
	     (pos) != NULL;				\

	     (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 char *bpf_map__name(struct bpf_map *map);

tools/perf/util/bpf-loader.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

		return -BPF_LOADER_ERRNO__INTERNAL;

	}

	map_fd = bpf_map__get_fd(map);

	map_fd = bpf_map__fd(map);

	if (map_fd < 0) {

		pr_debug("ERROR: failed to get fd from map %s\n", name);

		return map_fd;