summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-08-11 17:43:22 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-08-14 13:52:50 +0200
commit61e27564edd514b86adcd7835b1acaeb11abe14d (patch)
tree651ad1971b7b4ddc94ae08abe9547317ff6fc229
parentda578d3b2d236b50e356b1a9d770ad19165de31c (diff)
Revert "bpftool: Mount bpffs when pinmaps path not under the bpffs"
This reverts commit 65dd9cbafec2f6f7908cebcab0386f750fc352af which is commit da5f8fd1f0d393d5eaaba9ad8c22d1c26bb2bf9b upstream. It breaks the build, so should be dropped. Reported-by: Salvatore Bonaccorso <carnil@debian.org> Link: https://lore.kernel.org/r/ZrSe8gZ_GyFv1knq@eldamar.lan Cc: Tao Chen <chen.dylane@gmail.com> Cc: Daniel Borkmann <daniel@iogearbox.net> Cc: Quentin Monnet <qmo@kernel.org> Cc: Sasha Levin <sashal@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--tools/bpf/bpftool/prog.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/tools/bpf/bpftool/prog.c b/tools/bpf/bpftool/prog.c
index 21817eb510396..7e0b846e17eef 100644
--- a/tools/bpf/bpftool/prog.c
+++ b/tools/bpf/bpftool/prog.c
@@ -1707,10 +1707,6 @@ static int load_with_options(int argc, char **argv, bool first_prog_only)
}
if (pinmaps) {
- err = create_and_mount_bpffs_dir(pinmaps);
- if (err)
- goto err_unpin;
-
err = bpf_object__pin_maps(obj, pinmaps);
if (err) {
p_err("failed to pin all maps");