From nobody Thu Sep 10 02:32:40 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 4hgMCY1lTXz6rsFv for ; Thu, 10 Sep 2026 02:32:41 +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 4hgMCX5HrZz3M0f for ; Thu, 10 Sep 2026 02:32:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789007560; 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=6kQRyOeE/pTHoPs7txYDjvpNUDWJphcJBP22xIf8hGM=; b=cJ0Pdp53aiqs6ZU7Ezjo4uTmsRnAaKMeo1jGCkVAIT7BRavol0c+Mz/eY/5cmrG3onjVaH 8VaByxiUX8v/7X9YQzAZKt1MsoONBQO2K0/uRhKkHGOqAVY2VnqNZrKZmD4yxTba4p1OIb gkfu+ZJYkSgOeSmCrUAZvnscSk2f4Ue8/u4pw94ljb/L2zGfk47oRkoBCsdRvJfH6Cxq5y ATmb0YoVgReATpmNwndRAy6vrPFfPQcMUekTRqBlvXHuYGIQY5XytI4wswXfGbfz5fvub/ qfROOAjfZEm5veerV8mI4QkHGvSvsWgB5xJ4ZFs2S1ikbsjyhP+zfpeMLsoJNw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789007560; b=h6u9gdRJ53mTnSWvkDqms0wH7LiluAsvKw6cfRepEFN04Dy6qsnb7HawaeSCw8++aJTiEC V+vlTcqYNDHyzhxJzpVkalmj7J4DXPRpoy43o8X6A7CRdRIMlUdxw7cpaw1N20uVqJ03Jk wvSITgudOjR4r1INVFiALyFnWgCr9vLOYZzNijBi0d5HYaDGwj0mRZUm0In9yWYFmY1Syx SjoRszJPa4sFs8YjX37hhzAggaMzcafbHTdchG9TNB2mJewuDGHJEWaZvDhy6YXm7y4Oxe 7/Aq8AtwZlRBYO6fV1xQwoCMRUtZua6i8blD676jWShy+OCU9pIusdsp9S7wVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789007560; 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=6kQRyOeE/pTHoPs7txYDjvpNUDWJphcJBP22xIf8hGM=; b=Kb1Hn4hJzAGFIUAPH5L7KCseHXiOyfJmbrT1ybEq1Inw/ktqrn6h+QfhMhSd/+NUkXFNoY tCXAFZy5Xsar6CX7qwL55XfXzSywUyGcI/5u/wrF3DqUSTodbJjFo74CoHFlmaG+MbGnV6 HizyXo1PG9QJnJC0zvymw7LI2jbkEkcH3c9UWMmTmW1VgmHrSbeWGUsuN6xQnZBeKkWu6R meAPsSgcujvfWXoeQxJVMNaqwAr+goA/UMg5g1P4KFlojn+eo4dLUzYobwTeZgX7fDuRke KyQ5LUFnrWMP84W+H/aDH/9hBh8G0mgkcZDqTrzNgdlSEJ1gc3f++mZp2o3XJw== 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 4hgMCX4MJyz1N1J for ; Thu, 10 Sep 2026 02:32:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 206e4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 10 Sep 2026 02:32:40 +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: 33bba26ad179 - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: 33bba26ad179a76b49a68be9edbf1b72817bf33e Auto-Submitted: auto-generated Date: Thu, 10 Sep 2026 02:32:40 +0000 Message-Id: <6aa216c8.206e4.1a2995ce@gitrepo.freebsd.org> The branch stable/15 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=33bba26ad179a76b49a68be9edbf1b72817bf33e commit 33bba26ad179a76b49a68be9edbf1b72817bf33e Author: Jie Li AuthorDate: 2026-09-02 06:15:05 +0000 Commit: Xin LI CommitDate: 2026-09-10 02:27:55 +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--; }