From nobody Wed Jun 07 22:37:25 2023 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 4Qc2KL26mDz4bZmD; Wed, 7 Jun 2023 22:37:26 +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 4Qc2KL19Rsz4N29; Wed, 7 Jun 2023 22:37:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686177446; 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=mBuxoxQ4xJfraKV8PlVFA0eq+k6/ZpQ5CI3Y5TxMebY=; b=dZG8RcGSea+q2tilzHygt/t+y6rIjuUm7u8yxdvAfwyPOmuoXA72sIbnCZFJfafel580PZ CkkUaHFS6no1Z4m9arpEKETti5ZlDuw/KJ4h9sSu1+RsTCda5E/bhQ/DYEiQ+bJimHE31h KbV9CknF0JTqu95nA+w8AIqYn1IwxgOxX04P0VGsRbqBc5buJ5icad+388AUbmGTFBrGUi p9WLvu0//Mi8Gx45Yg3SvVkx1/T8KZ7RSD6rCG7cuA1oI9ZTqWaSl1h7OaW/7MI2bQVMSx +FWGTSabHOlpfgF2f0WD/RckzHgLSDnDOWkx4Qx+hWmAyJC1uajPJMvKiaI4iw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686177446; 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=mBuxoxQ4xJfraKV8PlVFA0eq+k6/ZpQ5CI3Y5TxMebY=; b=oLnM3lK/9fee7oyq1iQIdoTNDjeEg4hAS1ZFcaT18vS52FmixKsT6VSPjaqQnSK/ROWZww AkrkPzRXga1aiEBuFEJIoyaJvZ4BuSaHq5WwDOK4eaPPHutTkGGFW482nuu6077qMu4QBo QU7KfR3dSSDhmV8SFtBrD2fm1z4a/TA4EbHpVOZgyZKrTFnD2caPalzodiNGMc/3FQgcn1 OvnfDLwGhZLmQOFYq5PnuSamyt0uq8bToE7b7eqEaFn928cUh8nL3HDGi7bp2SNQTUHwVn Y71OtPifAiMJk2IhYeSOJaq/ZPLl+FykAUxhOuvmL8haX15Df4UQOT6kkmNliA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686177446; a=rsa-sha256; cv=none; b=cLUqQeXcOcVRw58/V/fb5NogIMEFJAWiCQm7dEZhBeWWnte7m/tA0rlBZJafCLO+2HXFNy lCGApwMwf5jLU5pSbKlWXwaIUA0KSr1rlsTWwWolNaQ74L6E2blzdsOOCQmq0JMlPUNvRI gv3t9pFhDejZ1dBpGVVfcGE7dHPWF2n+QkfwuOJio7jp+OJYAGT2sTBNBGhRu3ZRQN1zfR DpWGSUT8Q1kfC4hIXB95ySlQ8FVf61ilywGH5hDMvFs4vlpsWaE9XGncrv2spPt5Lw1jfh YXBChUXAA9hghZYvekiN+mQgdy6OxdUgQ5Zr979LlZ+mQNaoCahSujCqO3/4AA== 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 4Qc2KL0Cj3zV9y; Wed, 7 Jun 2023 22:37:26 +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 357MbP3b082205; Wed, 7 Jun 2023 22:37:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 357MbPTO082204; Wed, 7 Jun 2023 22:37:25 GMT (envelope-from git) Date: Wed, 7 Jun 2023 22:37:25 GMT Message-Id: <202306072237.357MbPTO082204@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kirk McKusick Subject: git: 77cbed11b2ea - stable/13 - Do not try to adjust a directory depth when its reconnection is declined. 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: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 77cbed11b2eabaa811963c60e83e83fd6677fca3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=77cbed11b2eabaa811963c60e83e83fd6677fca3 commit 77cbed11b2eabaa811963c60e83e83fd6677fca3 Author: Kirk McKusick AuthorDate: 2023-05-27 05:55:11 +0000 Commit: Kirk McKusick CommitDate: 2023-06-07 22:36:39 +0000 Do not try to adjust a directory depth when its reconnection is declined. Sponsored by: The FreeBSD Foundation (cherry picked from commit 49943856eb2710c6a6debdfa40d89d31d3fdb8ea) --- sbin/fsck_ffs/pass3.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sbin/fsck_ffs/pass3.c b/sbin/fsck_ffs/pass3.c index b9d24f18371b..49cb43620392 100644 --- a/sbin/fsck_ffs/pass3.c +++ b/sbin/fsck_ffs/pass3.c @@ -100,10 +100,10 @@ pass3(void) if (linkup(orphan, inp->i_dotdot, NULL)) { inp->i_parent = inp->i_dotdot = lfdir; inoinfo(lfdir)->ino_linkcnt--; + inoinfo(orphan)->ino_state = DFOUND; + check_dirdepth(inp); + propagate(); } - inoinfo(orphan)->ino_state = DFOUND; - check_dirdepth(inp); - propagate(); continue; } pfatal("ORPHANED DIRECTORY LOOP DETECTED I=%lu",