From nobody Fri Jun 24 19:36:48 2022 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 E8E3C863F05; Fri, 24 Jun 2022 19:36:48 +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 4LV6nX2DBDz4X65; Fri, 24 Jun 2022 19:36:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656099408; 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=+9i3rf9TwgHEUXhVJ7m9WyvZZEdKL0cV88CxX2OczHA=; b=yo+iSPwxO3kjrrXu5+Q4+1Xy01XAikg/ljrwgPPWXTgbBmjAvkF1sQQsvNaTNy9TiG1MEo Mf6uPaYn1J7lNNwhz1llqhI9KFIO8MRkDmxqwNDFi4czi/WYxAHyo9zsNX/eLdlwj4k1BN Gb38qSjOCs9Sp4zjdxIllU+0GSYJPCkbgpppjJD9iBaslxuCCL7PDWOCfQ6JKPTlMNOTbm XDbaKifCAlSdCwYXEU9zDHuDW6MNxkpwavJx6NXCi3AnGMa094H3SQ6O/8SPGz/hS75dYF qgbV0FSzpqvP6319NF0Fwt43mF6Gxc30CcyhPBE8PpE2iz6IzGJqd3twRyBOhw== 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 1B661162FD; Fri, 24 Jun 2022 19:36:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25OJam0E084006; Fri, 24 Jun 2022 19:36:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25OJamI2084005; Fri, 24 Jun 2022 19:36:48 GMT (envelope-from git) Date: Fri, 24 Jun 2022 19:36:48 GMT Message-Id: <202206241936.25OJamI2084005@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: 55b04fbcf8cd - stable/13 - reap_kill(): rename the reap variable to reaper 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/13 X-Git-Reftype: branch X-Git-Commit: 55b04fbcf8cd0688254c33b70af75ef9e8e98259 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656099408; 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=+9i3rf9TwgHEUXhVJ7m9WyvZZEdKL0cV88CxX2OczHA=; b=QxpFGRarLMv3+j9fVjucr6ab9gZLjtcVfqkf2nbuOmeNuJFA2aB5hdSZCua20HZbR5m+hd xgbjOQC5tDDLKwy8aLajUmB3QQvbrqysN+h/1FVn41tPn+jXx+OzxGlYeC5YZnJH+6t6wJ SupR/ZgB3LSbiqHCTCjNpxME/YF/fcv5fVa7tjt0Wcf9mL7hNDhtwaV1r8PN/Pkp2qqF8o jgDrFFZLFdiWRnl+F3xu9WQ90EZZ/qWu5acsSbRF6uaQiO2378xvGRuLyP089Hbw2pVTDc X375oL3Y6JRPFHyImLGee31BAfd+3Yc13QGyfCxmcOZjMe5wzZ6pGt16nPvB4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656099408; a=rsa-sha256; cv=none; b=ZOhUEb9ZK6Q5g3MJc4rhrILUAI9Dv6VU9bjrnzXJr4LqHpqiEcUpQmqEW6GNZ3BVakWKcC SabRtM/JWU/+w7nGoxnz58qli/sqoE36x9rWhfAR/AmkDKL/wB5fDi/NaBtXtsOIdGe7wn LitnBAL7r3BEbxTrSAQGuRqp2KPllUn/YMY0UfJaqZcACy8Jaqp3QvZHHMaty6Wmh/zYME +7QMpeSqXxgwe4ev+pZ8w5qv3LxsjKQFPVQku+V+RipbFrwFSnXdR6m2I9vVLTxkKBDOJC ue2pf3rEi6HnbbfhjylHRSGF/+OIu2E8c27+ifUgcNtIJFlWc2cW8T7VnKJa3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=55b04fbcf8cd0688254c33b70af75ef9e8e98259 commit 55b04fbcf8cd0688254c33b70af75ef9e8e98259 Author: Konstantin Belousov AuthorDate: 2022-04-25 22:10:16 +0000 Commit: Konstantin Belousov CommitDate: 2022-06-24 14:45:44 +0000 reap_kill(): rename the reap variable to reaper (cherry picked from commit 134529b11b5343aed09e220b49147873d052e4bf) --- sys/kern/kern_procctl.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/kern/kern_procctl.c b/sys/kern/kern_procctl.c index 96748e27f57c..a8c56f7ae8ff 100644 --- a/sys/kern/kern_procctl.c +++ b/sys/kern/kern_procctl.c @@ -281,7 +281,7 @@ reap_kill_sched(struct reap_kill_tracker_head *tracker, struct proc *p2) static int reap_kill(struct thread *td, struct proc *p, void *data) { - struct proc *reap, *p2; + struct proc *reaper, *p2; ksiginfo_t ksi; struct reap_kill_tracker_head tracker; struct reap_kill_tracker *t; @@ -299,7 +299,7 @@ reap_kill(struct thread *td, struct proc *p, void *data) (REAPER_KILL_CHILDREN | REAPER_KILL_SUBTREE)) return (EINVAL); PROC_UNLOCK(p); - reap = (p->p_treeflag & P_TREE_REAPER) == 0 ? p->p_reaper : p; + reaper = (p->p_treeflag & P_TREE_REAPER) == 0 ? p->p_reaper : p; ksiginfo_init(&ksi); ksi.ksi_signo = rk->rk_sig; ksi.ksi_code = SI_USER; @@ -309,7 +309,7 @@ reap_kill(struct thread *td, struct proc *p, void *data) rk->rk_killed = 0; rk->rk_fpid = -1; if ((rk->rk_flags & REAPER_KILL_CHILDREN) != 0) { - LIST_FOREACH(p2, &reap->p_children, p_sibling) { + LIST_FOREACH(p2, &reaper->p_children, p_sibling) { reap_kill_proc(td, p2, &ksi, rk, &error); /* * Do not end the loop on error, signal @@ -318,13 +318,13 @@ reap_kill(struct thread *td, struct proc *p, void *data) } } else { TAILQ_INIT(&tracker); - reap_kill_sched(&tracker, reap); + reap_kill_sched(&tracker, reaper); while ((t = TAILQ_FIRST(&tracker)) != NULL) { MPASS((t->parent->p_treeflag & P_TREE_REAPER) != 0); TAILQ_REMOVE(&tracker, t, link); LIST_FOREACH(p2, &t->parent->p_reaplist, p_reapsibling) { - if (t->parent == reap && + if (t->parent == reaper && (rk->rk_flags & REAPER_KILL_SUBTREE) != 0 && p2->p_reapsubtree != rk->rk_subtree) continue;