From nobody Sat May 27 05:56:00 2023 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 4QSrcx1yNFz4WY3K; Sat, 27 May 2023 05:56:01 +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 4QSrcx1CxFz53jj; Sat, 27 May 2023 05:56:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685166961; 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=KIo8ZnTMFZRbxHGxJZWrOQ2WKIh129eHOcJ0zZpvDrw=; b=jMQh+shYOrQLvk4a6sjH6DJtdb1dowFQqR876xJH3Q7O1580X2REX3vewI0QxTMfO/iy4P LfLBA2tqWh1XRcQzcP58LnfdglZahP7Zx+UQ0KZQ7VEJLktol0NPZbwDaARvy0bSTbU9RM dK6mocXMsxDHxKwmk7Av0rES4oBIjikib9FC32Wr35pAM7l8WXSetpxujXYsMFY8kl6Q5a J1bibTShJosoVSL4u1MkFWOR+r4VgI6UTjVD1a/hme7SXyjn7e+Hy9Q5UfU3fAAZF7sDnt xLdQD80bgPZW7q0tIXx5Ll0mPVqceXXFBHbN39vNgxTRmmvgddHJEWZoGHAr2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685166961; 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=KIo8ZnTMFZRbxHGxJZWrOQ2WKIh129eHOcJ0zZpvDrw=; b=n7zp3NKU8o5cynR4AnU0lNHibGXm56PfTju4dXxuy84m7zvCdannren7Lu5iovOaHgZ3Zs kD1cecKYdIUQ5prgRgg2+9ErzHAmT3Ybo+a/+/+MV5gPwLBPtatwjCCKo4Kko9XG5BVHOw 27cM37GXbFw7dm1PRkUlq5TU8bdmr3cKyAxCQffbMhYzZRgSctNGwpp/FGD8ghJXMSu5UM lHaMNWD/4p2Vhp6uiqBYnVlRp/A3NTTkB/WQERmNAEHBjdXdyb3DKbBA6FcLuVbAC5Z9gC DpndP3xOlk3JK287ewg2suAg/jF46BLmvPdRxg8QjTCux5odPKOnRCOak0+mEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685166961; a=rsa-sha256; cv=none; b=FSs5oo6/Trjk1aaztdcGKwBZYvOHyFPpkYnigHujFPIZ2heGdl9s5BQRKB18tEEqikRyHV H/Mvm4oZxMZSepKmIELW4eGxmMtnsnn8pZkx0J7/3bENbzCEVD2P+D4R19fW9Dpl/kZO7e FMpzzRziZkBZmFWxI+lk3mne0tywSyz3snA//QfOJ89MRRRVn/lmRC7U+dCkal//WlDAip qJvaYzEiQ3nz1JGTxaqapAJOGfb7gU/IEsQO+Xh1d0dI6uh9lKm7E3h8sKfBJse2wC3aHP 3i/J3di53kVZVJ/MFJUheSFU3fPuDSgwpPIEAWNsnWbXwS5h0jSRtr3uEJK3Ng== 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 4QSrcx0K61zd6F; Sat, 27 May 2023 05:56:01 +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 34R5u0Rq078467; Sat, 27 May 2023 05:56:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34R5u08A078466; Sat, 27 May 2023 05:56:00 GMT (envelope-from git) Date: Sat, 27 May 2023 05:56:00 GMT Message-Id: <202305270556.34R5u08A078466@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kirk McKusick Subject: git: 49943856eb27 - main - Do not try to adjust a directory depth when its reconnection is declined. 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: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 49943856eb2710c6a6debdfa40d89d31d3fdb8ea Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=49943856eb2710c6a6debdfa40d89d31d3fdb8ea commit 49943856eb2710c6a6debdfa40d89d31d3fdb8ea Author: Kirk McKusick AuthorDate: 2023-05-27 05:55:11 +0000 Commit: Kirk McKusick CommitDate: 2023-05-27 05:55:11 +0000 Do not try to adjust a directory depth when its reconnection is declined. MFC after: 1 week Sponsored by: The FreeBSD Foundation --- 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",