| Message ID | 20240821101500.4568-1-11162571@vivo.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | [v1] tools:util:Remove the check that map is empty. | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch |
On Wed, Aug 21, 2024 at 06:14:56AM -0400, Yang Ruibin wrote: > The check that map is empty is already done in the bpf_map__fd (map) > function and returns an err_no, which does not run further checks. > In addition, even if the check for map is run, the return is a pointer, > which is not consistent with the err_number returned by bpf_map__fd (map). Thanks, applied, looks like an artifact from the patch that removed the bpf_map__def() API. - Arnaldo > Signed-off-by: Yang Ruibin <11162571@vivo.com> > --- > tools/perf/util/bpf_map.c | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/tools/perf/util/bpf_map.c b/tools/perf/util/bpf_map.c > index 81a4d5a7ccf7..578f27d2d6b4 100644 > --- a/tools/perf/util/bpf_map.c > +++ b/tools/perf/util/bpf_map.c > @@ -35,9 +35,6 @@ int bpf_map__fprintf(struct bpf_map *map, FILE *fp) > if (fd < 0) > return fd; > > - if(!map) > - return PTR_ERR(map); > - > err = -ENOMEM; > key = malloc(bpf_map__key_size(map)); > if (key == NULL) > -- > 2.34.1
diff --git a/tools/perf/util/bpf_map.c b/tools/perf/util/bpf_map.c index 81a4d5a7ccf7..578f27d2d6b4 100644 --- a/tools/perf/util/bpf_map.c +++ b/tools/perf/util/bpf_map.c @@ -35,9 +35,6 @@ int bpf_map__fprintf(struct bpf_map *map, FILE *fp) if (fd < 0) return fd; - if(!map) - return PTR_ERR(map); - err = -ENOMEM; key = malloc(bpf_map__key_size(map)); if (key == NULL)
The check that map is empty is already done in the bpf_map__fd (map) function and returns an err_no, which does not run further checks. In addition, even if the check for map is run, the return is a pointer, which is not consistent with the err_number returned by bpf_map__fd (map). Signed-off-by: Yang Ruibin <11162571@vivo.com> --- tools/perf/util/bpf_map.c | 3 --- 1 file changed, 3 deletions(-)