From nobody Sun Feb 18 10:09:10 2024 X-Original-To: dev-commits-src-branches@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 4Td1bq1jZPz5C8wD; Sun, 18 Feb 2024 10:09:11 +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 4Td1bq0H9Fz4CZQ; Sun, 18 Feb 2024 10:09:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708250951; 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=/oxEw8AqZOdRNuyEwbmGGkx+kB8/Bq1scEazl7IxQbg=; b=Y9DTgxwNyP4KK8l1MsVn5whYAUJQRq1F2190dC8Hov2eFtiFIvjn10ZFRNaRS5Iz/1p77x EkwHJNpfNAqGw7vsSZicFroblP310nFs3WJmtjf/yfjsE6VoTmfyY3lpjM6Vi0Y3jlk84p oarxMIA6qTxo/0Yc6R2RqOMsbnuFxyBlyb88ZAGD4yFQ7C2LaagXU8kIVNx0+CDLoapqp5 wzKnMviDmHQdeIhfMVPirAdJJ0xAGItAUx/LPyO5j/21gB4kUCNuBVU06eMfxvVxHT2z7z jv6hbxHrnp7KoCe/js6btTHRGkS1YCdplnNaj4IIIe6kcvetcq+1Fe96jbCP8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708250951; 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=/oxEw8AqZOdRNuyEwbmGGkx+kB8/Bq1scEazl7IxQbg=; b=BA347vrxjou0L9yG5CfLv1yVdh4JV2LgALe47M7Webr8hxEhw5jXK2m+TOjPSLDPYSin0m x/WlFFXwYhnLDKcEUltEPUiKXq8G6LhEKQT9GoUtIH4n5rsd7MnXW0dvtTQyFlLFp036UT JROteSEL/FVSGtHnTDlnKQ1P38CqqP78CHSjVD0hAa4PSN1DdppYIh8zY8U7bOsqNo5H+C 04yhcPFuweKjY3oroO/uhLtGOEg2BtQd6SBFvtveuNHWGJgpNxBzS//YP1FSMedKIlzwlo +Q8MtVvc1zl8hkvZveUQxPsEw/wrMXRVMz1khsrzSRnjAfZ4d3vD3eLkeOigaw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708250951; a=rsa-sha256; cv=none; b=cfT9QTAROaphrsHQSFCW0QvuPGp9oySz8j9pFsXHw6a0x9tLGSnQSEwJX8cWduWcbS/l3e UxlLU7kErMgs+arEeC5zErxdUVVGBJ4+lKVi/+Wof26EmYchJ46l6qsesOvad1xlP7eur/ McJZI7JcP9dqgTgUcqoFUR0xEDwloB6UaRMz6R8BauVq1ROJWgb3/lJm1fIIk84SY8ymaA QT6hpXIOkEGyANs0dfbEtozpmV3Ug25ixTVV6P0bog7kQNyJQuTOT6cuFhWbEE5xpACYZH ab9BorWO2BaAmBR0GtmrFqYlN2tPHr7Qg51p8W/5Z1SpPhG6rq/1koxgoM/V1w== 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 4Td1bp6T2szn0C; Sun, 18 Feb 2024 10:09:10 +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 41IA9A6r086059; Sun, 18 Feb 2024 10:09:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41IA9AvY086056; Sun, 18 Feb 2024 10:09:10 GMT (envelope-from git) Date: Sun, 18 Feb 2024 10:09:10 GMT Message-Id: <202402181009.41IA9AvY086056@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: e43855c6f134 - stable/14 - rtld load_filtees(): reindent and reduce block nesting List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/14 X-Git-Reftype: branch X-Git-Commit: e43855c6f1346759b126d7c7ea247a9abcf0a2da Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e43855c6f1346759b126d7c7ea247a9abcf0a2da commit e43855c6f1346759b126d7c7ea247a9abcf0a2da Author: Konstantin Belousov AuthorDate: 2024-02-13 01:19:43 +0000 Commit: Konstantin Belousov CommitDate: 2024-02-18 10:01:47 +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 380b2696f41c..e71903ba5e12 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -2572,13 +2572,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