From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0a-00082601.pphosted.com (mx0a-00082601.pphosted.com [67.231.145.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 626CD1852 for ; Thu, 4 Jan 2024 01:38:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=meta.com Received: from pps.filterd (m0109334.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 403MFV2Z003308 for ; Wed, 3 Jan 2024 17:38:56 -0800 Received: from maileast.thefacebook.com ([163.114.130.16]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3vdg740xug-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Wed, 03 Jan 2024 17:38:56 -0800 Received: from twshared68648.02.prn6.facebook.com (2620:10d:c0a8:1c::1b) by mail.thefacebook.com (2620:10d:c0a8:82::b) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.34; Wed, 3 Jan 2024 17:38:55 -0800 Received: by devbig019.vll3.facebook.com (Postfix, from userid 137359) id 546513DFAFE47; Wed, 3 Jan 2024 17:38:53 -0800 (PST) From: Andrii Nakryiko To: , , , CC: , , Jiri Olsa Subject: [PATCH v3 bpf-next 1/9] libbpf: make uniform use of btf__fd() accessor inside libbpf Date: Wed, 3 Jan 2024 17:38:39 -0800 Message-ID: <20240104013847.3875810-2-andrii@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240104013847.3875810-1-andrii@kernel.org> References: <20240104013847.3875810-1-andrii@kernel.org> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-FB-Internal: Safe Content-Type: text/plain X-Proofpoint-ORIG-GUID: D7pUr9lCt3rAZe9X3Ylr33oYtejlvYsG X-Proofpoint-GUID: D7pUr9lCt3rAZe9X3Ylr33oYtejlvYsG X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.997,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-01-03_10,2024-01-03_01,2023-05-22_02 It makes future grepping and code analysis a bit easier. Acked-by: Jiri Olsa Signed-off-by: Andrii Nakryiko --- tools/lib/bpf/libbpf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index ebcfb2147fbd..f1521a400f02 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -7050,7 +7050,7 @@ static int bpf_object_load_prog(struct bpf_object *= obj, struct bpf_program *prog load_attr.prog_ifindex =3D prog->prog_ifindex; =20 /* specify func_info/line_info only if kernel supports them */ - btf_fd =3D bpf_object__btf_fd(obj); + btf_fd =3D btf__fd(obj->btf); if (btf_fd >=3D 0 && kernel_supports(obj, FEAT_BTF_FUNC)) { load_attr.prog_btf_fd =3D btf_fd; load_attr.func_info =3D prog->func_info; --=20 2.34.1