OSDN Git Service

Merge branch 'bpf-bpftool-various-fixes'
authorDaniel Borkmann <daniel@iogearbox.net>
Sat, 23 Dec 2017 00:09:53 +0000 (01:09 +0100)
committerDaniel Borkmann <daniel@iogearbox.net>
Sat, 23 Dec 2017 00:09:53 +0000 (01:09 +0100)
commitaee657460a8ce66443d5e7413046d02d7b2165db
tree36104aee2ea7b2b4a7326c369478890aad7243ef
parentcd95a89282ef61458c3758d70ebfbd91f303033f
parent8207c6dd4746c345b689684c4cd0ce00a18c7ef2
Merge branch 'bpf-bpftool-various-fixes'

Jakub Kicinski says:

====================
Two small fixes here to listing maps and programs.  The loop for showing
maps is written slightly differently to programs which was missed in JSON
output support, and output would be broken if any of the system calls
failed.  Second fix is in very unlikely case that program or map disappears
after we get its ID we should just skip over that object instead of failing.
====================

Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>