| Message ID | 20190411080332.24574-1-bpoirier@suse.com |
|---|---|
| State | Accepted |
| Delegated to: | BPF Maintainers |
| Headers | show |
| Series | [bpf] bpftool: Fix errno variable usage | expand |
2019-04-11 17:03 UTC+0900 ~ Benjamin Poirier <bpoirier@suse.com> > The test meant to use the saved value of errno. Given the current code, it > makes no practical difference however. > > Fixes: bf598a8f0f77 ("bpftool: Improve handling of ENOENT on map dumps") > Signed-off-by: Benjamin Poirier <bpoirier@suse.com> > --- > tools/bpf/bpftool/map.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tools/bpf/bpftool/map.c b/tools/bpf/bpftool/map.c > index e0c650d91784..05b029b934a6 100644 > --- a/tools/bpf/bpftool/map.c > +++ b/tools/bpf/bpftool/map.c > @@ -720,7 +720,7 @@ static int dump_map_elem(int fd, void *key, void *value, > jsonw_string_field(json_wtr, "error", strerror(lookup_errno)); > jsonw_end_object(json_wtr); > } else { > - if (errno == ENOENT) > + if (lookup_errno == ENOENT) > print_entry_plain(map_info, key, NULL); > else > print_entry_error(map_info, key, > Reviewed-by: Quentin Monnet <quentin.monnet@netronome.com>
On Thu, Apr 11, 2019 at 4:23 AM Quentin Monnet <quentin.monnet@netronome.com> wrote: > > 2019-04-11 17:03 UTC+0900 ~ Benjamin Poirier <bpoirier@suse.com> > > The test meant to use the saved value of errno. Given the current code, it > > makes no practical difference however. > > > > Fixes: bf598a8f0f77 ("bpftool: Improve handling of ENOENT on map dumps") > > Signed-off-by: Benjamin Poirier <bpoirier@suse.com> Acked-by: Song Liu <songliubraving@fb.com> > > --- > > tools/bpf/bpftool/map.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/tools/bpf/bpftool/map.c b/tools/bpf/bpftool/map.c > > index e0c650d91784..05b029b934a6 100644 > > --- a/tools/bpf/bpftool/map.c > > +++ b/tools/bpf/bpftool/map.c > > @@ -720,7 +720,7 @@ static int dump_map_elem(int fd, void *key, void *value, > > jsonw_string_field(json_wtr, "error", strerror(lookup_errno)); > > jsonw_end_object(json_wtr); > > } else { > > - if (errno == ENOENT) > > + if (lookup_errno == ENOENT) > > print_entry_plain(map_info, key, NULL); > > else > > print_entry_error(map_info, key, > > > > > Reviewed-by: Quentin Monnet <quentin.monnet@netronome.com>
On 04/11/2019 10:03 AM, Benjamin Poirier wrote: > The test meant to use the saved value of errno. Given the current code, it > makes no practical difference however. > > Fixes: bf598a8f0f77 ("bpftool: Improve handling of ENOENT on map dumps") > Signed-off-by: Benjamin Poirier <bpoirier@suse.com> Applied, thanks!
On Thu, Apr 11, 2019 at 12:56 PM Daniel Borkmann <daniel@iogearbox.net> wrote: > > On 04/11/2019 10:03 AM, Benjamin Poirier wrote: > > The test meant to use the saved value of errno. Given the current code, it > > makes no practical difference however. > > > > Fixes: bf598a8f0f77 ("bpftool: Improve handling of ENOENT on map dumps") > > Signed-off-by: Benjamin Poirier <bpoirier@suse.com> > > Applied, thanks! I removed this commit from bpf tree and re-applied to bpf-next. Benjamin, next time please target such cleanups consistently to bpf-next tree only to avoid merge conflicts. Thanks
diff --git a/tools/bpf/bpftool/map.c b/tools/bpf/bpftool/map.c index e0c650d91784..05b029b934a6 100644 --- a/tools/bpf/bpftool/map.c +++ b/tools/bpf/bpftool/map.c @@ -720,7 +720,7 @@ static int dump_map_elem(int fd, void *key, void *value, jsonw_string_field(json_wtr, "error", strerror(lookup_errno)); jsonw_end_object(json_wtr); } else { - if (errno == ENOENT) + if (lookup_errno == ENOENT) print_entry_plain(map_info, key, NULL); else print_entry_error(map_info, key,
The test meant to use the saved value of errno. Given the current code, it makes no practical difference however. Fixes: bf598a8f0f77 ("bpftool: Improve handling of ENOENT on map dumps") Signed-off-by: Benjamin Poirier <bpoirier@suse.com> --- tools/bpf/bpftool/map.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)