From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EB349C4332F for ; Sun, 8 Sep 2019 12:58:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C27B420693 for ; Sun, 8 Sep 2019 12:58:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567947514; bh=DDRBfrNOnnNyPPEaw7z11TCRBuBCJY42KwC9RympBBQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=rNIr7HM5oWH+valXJq+T61dhLghKlTJ8jPyKtS42B8xZ+8NKwRYCQcT/6jEAGGzq0 SshEt2P1VsPp7/pYNwvymRdCRgvdGGiBQzOOSsX1uyRxHTfI7CFojqglYmNLo/abRk EfemyUIDGs/pRNl2vQmREsNZCvxL66VYquMo/Vos= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726282AbfIHM6a (ORCPT ); Sun, 8 Sep 2019 08:58:30 -0400 Received: from mail.kernel.org ([198.145.29.99]:35156 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726294AbfIHMrG (ORCPT ); Sun, 8 Sep 2019 08:47:06 -0400 Received: from localhost (unknown [62.28.240.114]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E1611218AF; Sun, 8 Sep 2019 12:47:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567946826; bh=DDRBfrNOnnNyPPEaw7z11TCRBuBCJY42KwC9RympBBQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=j9smrZ7DlNUm2bPDAqtrBDenVJmd0gR3tHL3OstFPcO+4iCO9mU/ns7O9PopOnhRB Ihn1nHy2yS9oUTcxp2wbaox/B2NGT9kjWSI6YhoAlwwB2zDT/pFxRcBg15Yay6/hSZ 0xE2DM59xzQxHMdf5HwAVQap19iKvzuops132aXc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jakub Kicinski , Quentin Monnet , Daniel Borkmann , Sasha Levin Subject: [PATCH 4.19 15/57] tools: bpftool: fix error message (prog -> object) Date: Sun, 8 Sep 2019 13:41:39 +0100 Message-Id: <20190908121131.936905876@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190908121125.608195329@linuxfoundation.org> References: <20190908121125.608195329@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ Upstream commit b3e78adcbf991a4e8b2ebb23c9889e968ec76c5f ] Change an error message to work for any object being pinned not just programs. Fixes: 71bb428fe2c1 ("tools: bpf: add bpftool") Signed-off-by: Jakub Kicinski Reviewed-by: Quentin Monnet Signed-off-by: Daniel Borkmann Signed-off-by: Sasha Levin --- tools/bpf/bpftool/common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/bpf/bpftool/common.c b/tools/bpf/bpftool/common.c index fcaf00621102f..be7aebff0c1e5 100644 --- a/tools/bpf/bpftool/common.c +++ b/tools/bpf/bpftool/common.c @@ -238,7 +238,7 @@ int do_pin_any(int argc, char **argv, int (*get_fd_by_id)(__u32)) fd = get_fd_by_id(id); if (fd < 0) { - p_err("can't get prog by id (%u): %s", id, strerror(errno)); + p_err("can't open object by id (%u): %s", id, strerror(errno)); return -1; } -- 2.20.1