From nobody Thu Feb 29 00:26:16 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TlX885ByYz5Cj0c; Thu, 29 Feb 2024 00:26:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TlX88408yz54WL; Thu, 29 Feb 2024 00:26:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709166376; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RG57gXjKJxig0QDuWaSRBxU+GLING//AMf+omF6dzDQ=; b=iga2zwDxxuQTfCEkTUkBzb3TbvmTbpMLBfi3OB/CfasUL1u7t52aQI8We+Dt7ZWOqUOKDU rT0qqYMpJLADtSRYdqoxiEKCQanjBlmNBwy1zQcWoIXV2JFmZ0PwIq/JI0eQ74JcPRfOcV fnU/GReGcJOlWmibQSd00SUK6x0jl5zs7rbq4oJ5jHuU1FDqSV83LdHkVhwdWiQAyQPNPp 6kIC5uaLJ9F1BN4WfJ+BtJXkQA7O5ojSIPzvmnTpcPqBTB1kfxOAe/R9kTEJOUaU6vjH6o jBgrqgCuIfv8t9nuw8gAcEp8SAT6R6KSauFCTKKNv5JUzM9voIKk5v6e3ixBhQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709166376; a=rsa-sha256; cv=none; b=RuqlikgwV57Y7obFWelfRMgpdA4qF8AaUuQwPxy9FsiPdoPkajfKJJlWjryGN1zuyQ6691 vGk26aSBmyGVx02TGbdbZNzCm4KBeJCscP/cOsJW8vBVsDHwGsywSjaX5VXumd+AUSvpVT KxtN4AqvCmZFc7okkar5To44e8ADoaWhRWPIGpBZ/aprxliwvIY/GJFj8XrMBVzKhOK9H1 lnq9KxyrE4ZaOI5l2NGX8mTheGTpf0XRnXfu5F+1rJJSACiax8qTx4aTd1ZHnjdXmUAEYG U51OrpLLmGtbHfZwYiSm8QEcmvwJlwI7dnJxA+C02G+NA9gUlfCJUn2Yvv6PRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709166376; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RG57gXjKJxig0QDuWaSRBxU+GLING//AMf+omF6dzDQ=; b=iRch6BJnNVcrVLWNqVAVwfiyy/lCnFBXCGIO2jW11KH7LEiFCyRA7ZJQAjw9o7ZSIBw7lr 4vVVARvh6mfzz+CLYpM6NJG+3zx/lVCEGT+bM2VyxZxUhmnACsMU1H31TiB6N/t5pFXnqW gr6azfMOVJPw86Moi8fGD2cte4B4JRBa8YrLWrt8P9WJx0uLfhXV9Zm6nzBl/K+abucLQ/ 1K6Rktqm/dbITiDZngNd8CxRm1912JER5UHlA9sp6MVyeznjd9DOpu2r+XfK1J6ZtxcnpP cJcJorL9QGk9JLECFhHUYDsiPl7T2XbyurkHRcIXds/0mSqNcq0YAnYb/pQ+oA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TlX883ZB8zKKp; Thu, 29 Feb 2024 00:26:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41T0QGWE096816; Thu, 29 Feb 2024 00:26:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41T0QGiN096813; Thu, 29 Feb 2024 00:26:16 GMT (envelope-from git) Date: Thu, 29 Feb 2024 00:26:16 GMT Message-Id: <202402290026.41T0QGiN096813@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 3d49b2e4d730 - stable/13 - rtld load_filtees(): reindent and reduce block nesting List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3d49b2e4d730926b47387b93515fc78a478d7ea6 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=3d49b2e4d730926b47387b93515fc78a478d7ea6 commit 3d49b2e4d730926b47387b93515fc78a478d7ea6 Author: Konstantin Belousov AuthorDate: 2024-02-13 01:19:43 +0000 Commit: Konstantin Belousov CommitDate: 2024-02-29 00:24:43 +0000 rtld load_filtees(): reindent and reduce block nesting (cherry picked from commit 30b5f6b33b35623e6b6aa1d27a78311e199fa602) --- libexec/rtld-elf/rtld.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 56fca9cd60b2..a4278e70e872 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -2616,13 +2616,12 @@ load_filtee1(Obj_Entry *obj, Needed_Entry *needed, int flags, static void load_filtees(Obj_Entry *obj, int flags, RtldLockState *lockstate) { - - if (!obj->filtees_loaded) { + if (obj->filtees_loaded) + return; lock_restart_for_upgrade(lockstate); load_filtee1(obj, obj->needed_filtees, flags, lockstate); load_filtee1(obj, obj->needed_aux_filtees, flags, lockstate); obj->filtees_loaded = true; - } } static int