6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> This reverts commit 65dd9cbafec2f6f7908cebcab0386f750fc352af which is commit da5f8fd1f0d393d5eaaba9ad8c22d1c26bb2bf9b upstream. It breaks the build, so should be dropped. Reported-by: Salvatore Bonaccorso <carnil@xxxxxxxxxx> Link: https://lore.kernel.org/r/ZrSe8gZ_GyFv1knq@xxxxxxxxxxx Cc: Tao Chen <chen.dylane@xxxxxxxxx> Cc: Daniel Borkmann <daniel@xxxxxxxxxxxxx> Cc: Quentin Monnet <qmo@xxxxxxxxxx> Cc: Sasha Levin <sashal@xxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- tools/bpf/bpftool/prog.c | 4 ---- 1 file changed, 4 deletions(-) --- a/tools/bpf/bpftool/prog.c +++ b/tools/bpf/bpftool/prog.c @@ -1707,10 +1707,6 @@ static int load_with_options(int argc, c } 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");
