From nobody Thu Sep 10 02:32:13 2026 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 4hgMC26kkkz6rsd4 for ; Thu, 10 Sep 2026 02:32:14 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hgMC20cb9z3L5Z for ; Thu, 10 Sep 2026 02:32:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789007534; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T6RE7R61QZaxAFPwXCNqByPrRO9a0SPncL8tETOksV8=; b=rVUlcsRRRefU2hTBSzmLI7Q67Xs/w79+SY7HmevWdVU1T64el3u0V+rOFeHeGQbYSGFFeN PRxo5hx9iUuunp94X8IR40dCaSZjwszyRyrUE4wF/XZB4qI+3dpSgdN2NyAQ03T7HTCYrN 81zYfUokB/BAHWEFBDmDBhNi9/E2HdATBR5QPXxWajsqomnVKilb3+FoPwdg0ldqmch3fR 1H63d4T8j2LtUZsmxoU/Ss8siNg+Kl/+UjHgUME295MbzaArAWu1RWEJdAOeCfRFiJXn4X TQajUsfOJB2EXo8GLZTn8QevZIyI1Omb4bYPnW1+V1qoOWm8+7WJsiIcLuf9Nw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789007534; b=LgCdXmljIv46dlODlRFtLPc2zDvsQTcaRua4RwCq/lRLQjqAbUXR5nIOKkMsh2GNuN9HXB Ol4blOEVq2HMU0xO/w6I3wqxVy3iXcuRXOPIA4BnA8h8pZKBd3XkC9IRCc+6+xK18Gt0HL yMflFreqkFz0pyk1IM5FYnOWAwx/dE3eVkUF0mnymGqjl+e86Neet+W4F2tmthY14G+DgZ InWq8opwS2N9t28AbC+mf50LeEiY1U54J8ZYpRbNiMuRlNmGhIhVDLEAl3l4peROcKQTRy eiCLUyk1QUH9swRjQTKQJdgcApt9QHYEr7zmrIwnPHEpdZ4dVZoVvxMr24jNIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789007534; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T6RE7R61QZaxAFPwXCNqByPrRO9a0SPncL8tETOksV8=; b=G7+/uzLwNMVif8wNPBA2q4aMdE/geFOXV1KtKZgndaYp99KDJI13yk6aaHGrqCCLXaP1mi dIAZcotTvdzetIfq0GKYBlZPGzgHC4ZDC/aCkuyV3DOMx6lmRK1v9DXjnjUcjjwgjorzAn ALa47TIUFKiu2sgTa5ogLvDD2rB08ZcGkBmhVD858vo43csTE1AFTz1fDr6w0uvzKjpIss C+zwsas0HLEScRvixChs1+A+RdiF0Zdlb4JKd6Af01YhtMzJVPhE7+oJMxx0qzoXLpx4TM BLnhHopj8XoMf4AT/Ca63flwH/uyiCzsHK0Fgb/IFrdxmD/Z5wTU4GfG6s12RA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hgMC16TMsz1MxN for ; Thu, 10 Sep 2026 02:32:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21036 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 10 Sep 2026 02:32:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Jie Li From: Xin LI Subject: git: 8a702ccda30d - stable/14 - MFC: fsck_msdosfs: fix status accounting for lost cluster chains 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8a702ccda30da602007db38f1ebf91e92d72fe52 Auto-Submitted: auto-generated Date: Thu, 10 Sep 2026 02:32:13 +0000 Message-Id: <6aa216ad.21036.52f90e1b@gitrepo.freebsd.org> The branch stable/14 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=8a702ccda30da602007db38f1ebf91e92d72fe52 commit 8a702ccda30da602007db38f1ebf91e92d72fe52 Author: Jie Li AuthorDate: 2026-09-02 06:15:05 +0000 Commit: Xin LI CommitDate: 2026-09-10 02:31:07 +0000 MFC: fsck_msdosfs: fix status accounting for lost cluster chains (cherry picked from commit 6cf0d6c3b5777e053074200ff99dc4b750e62b96) --- sbin/fsck_msdosfs/fat.c | 41 ++++++++++++++++++++++++++++++++--------- 1 file changed, 32 insertions(+), 9 deletions(-) diff --git a/sbin/fsck_msdosfs/fat.c b/sbin/fsck_msdosfs/fat.c index bd8171043cc1..7d0ad9a595cf 100644 --- a/sbin/fsck_msdosfs/fat.c +++ b/sbin/fsck_msdosfs/fat.c @@ -1284,18 +1284,41 @@ checklost(struct fat_descriptor *fat) } if (fat_is_cl_head(fat, head)) { ret = checkchain(fat, head, &chainlength); - if (ret != FSERROR && chainlength > 0) { - pwarn("Lost cluster chain at cluster %u\n" - "%zd Cluster(s) lost\n", - head, chainlength); - mod |= ret = reconnect(fat, head, - chainlength); + /* + * Record whether checkchain() has repaired the + * chain (FSFATMOD) or died trying (FSFATAL) before + * reconnect() overwrites ret, otherwise the repair + * is never written back. + */ + if (ret != FSERROR) { + mod |= ret; + if (!(mod & FSFATAL) && chainlength > 0) { + pwarn( + "Lost cluster chain at cluster %u\n" + "%zd Cluster(s) lost\n", + head, chainlength); + ret = reconnect(fat, head, chainlength); + if (ret != FSERROR) + mod |= ret; + } } if (mod & FSFATAL) break; - if (ret == FSERROR && ask(0, "Clear")) { - clearchain(fat, head); - mod |= FSFATMOD; + /* + * If reconnect() failed (or checkchain() truncation + * was declined), defer folding FSERROR into mod until + * the Clear fallback is known: if the lost chain is + * cleared, the error has been resolved and must not + * report an exit code 8; otherwise record FSERROR as + * an unrecovered error. + */ + if (ret == FSERROR) { + if (ask(0, "Clear")) { + clearchain(fat, head); + mod |= FSFATMOD; + } else { + mod |= FSERROR; + } } chains--; }