From nobody Sun Dec 04 06:53:56 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 4NPy8500kMz4jZMQ; Sun, 4 Dec 2022 06:53:57 +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 4NPy846bkpz3CSS; Sun, 4 Dec 2022 06:53:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670136836; 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=h04dtmErutSDihe8JYL7WOqlsZfqMDAfV/g4/1YQHWw=; b=nDvJ1mlTAroIgNrbz6+an/RNcTOQij8de6I2opvV0nOVnpOh3lReJROfGCtzxDVlL40ckh 88yF/Vf2EED+IOaiRW9FUcr0kHhcyHYUF/DXtIwYCvvQzBi1S5VAk5eG/k4AtUtH5IQON2 IZNJ9WrdnS0DXDIP+gil0bs1FDZt+jIuHFwd0MxmRCFTWlWiGu34VrJB6T418m7MPSw/yp kQjVqBRRm1vTx9E/Zs5JM/pMgLJZ014z/OcypX3+zVsZ7D7DHCOjyPoWH9GOeXBE5PhZQp w7rE2BxAlCOfS0l9wGpYC1mk1FzrXyE4LNKE+q7WyKjB43rJZorZtVplgY9vlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670136836; 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=h04dtmErutSDihe8JYL7WOqlsZfqMDAfV/g4/1YQHWw=; b=gzyCXBr46hQIz73vJI5p7t8aznrc4PjMOC7cgdxkEqHdRckspIHijc7dmdop3E7jw0WnaB FuuUhJZOgHFRhzv6kyF9TNQWcKaIw4QxvpSxP+Xhlc9QvpoRn/t65VH6uvXK4jLSXQN59F kgk213tw/jvar4JNSHk3TlaRP5nZEAIrGwZbBo3YvYbOeivY3hc5tnLBb7wDXkL4PXmuEp Bf/0VKbSL7J5daX2zyq2pOahq7Ea5KYeJ/CDRPkChieFY30PvzKeNGmAU4P8PKBaP64GD0 J+G4xMP4G7BlKb6ULoy5Ljoad+WvTPQbeRieJXOftkYL6qO0uRvn1/3dYnyFoQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670136836; a=rsa-sha256; cv=none; b=jJhiEd0eUIpJM6alqg+MvhKJai9L1+LHMnQGgw1R+3LAL43TAL83H2PliMJr31vdg7HJNy m71ITB3AoBMEn2hDVF/thZdY8cOpm7GbTCx6Q3W9uauyNjbpcF5c9TgawMqdSfy3TaEXX4 UOtbEwOlGbRyg2orAW4jAiN8YIslJtdUsgV8pk66El7Nq9YrWbopSMGBHFifhY97FhcWPy 0leBr0NtC1mjct3pzSgwgXskfDBxvjv8tzzDvPl/lkz1EJtkOp3evPm3Bam/cIm9z9e3sL 7WOrwFfwHVhNRPxceEKuLOH4pKXdYQyFx8iHAgYvybohBwx2mXUxj1r4DO255w== 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 4NPy845fPFz1NvM; Sun, 4 Dec 2022 06:53:56 +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 2B46rusG072271; Sun, 4 Dec 2022 06:53:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B46rudg072270; Sun, 4 Dec 2022 06:53:56 GMT (envelope-from git) Date: Sun, 4 Dec 2022 06:53:56 GMT Message-Id: <202212040653.2B46rudg072270@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: 001fd6b05a57 - stable/13 - Additional diagnostic output when running fsck_ffs with debugging flag (-d) 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: 001fd6b05a57234208be67fcf4262f21d1dee408 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=001fd6b05a57234208be67fcf4262f21d1dee408 commit 001fd6b05a57234208be67fcf4262f21d1dee408 Author: Kirk McKusick AuthorDate: 2022-10-30 21:59:44 +0000 Commit: Kirk McKusick CommitDate: 2022-12-04 06:14:31 +0000 Additional diagnostic output when running fsck_ffs with debugging flag (-d) (cherry picked from commit 595746df6fe946363233bd3eb73abe34e4457359) Sponsored by: The FreeBSD Foundation --- sbin/fsck_ffs/pass5.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/sbin/fsck_ffs/pass5.c b/sbin/fsck_ffs/pass5.c index 324e725929f6..61be54ed54ed 100644 --- a/sbin/fsck_ffs/pass5.c +++ b/sbin/fsck_ffs/pass5.c @@ -375,6 +375,22 @@ pass5(void) if (cursnapshot == 0 && memcmp(&cstotal, &fs->fs_cstotal, sizeof cstotal) != 0 && dofix(&idesc[0], "SUMMARY BLK COUNT(S) WRONG IN SUPERBLK")) { + if (debug) { + printf("cstotal is currently: %jd dirs, %jd blks free, " + "%jd frags free, %jd inos free, %jd clusters\n", + (intmax_t)fs->fs_cstotal.cs_ndir, + (intmax_t)fs->fs_cstotal.cs_nbfree, + (intmax_t)fs->fs_cstotal.cs_nffree, + (intmax_t)fs->fs_cstotal.cs_nifree, + (intmax_t)fs->fs_cstotal.cs_numclusters); + printf("cstotal ought to be: %jd dirs, %jd blks free, " + "%jd frags free, %jd inos free, %jd clusters\n", + (intmax_t)cstotal.cs_ndir, + (intmax_t)cstotal.cs_nbfree, + (intmax_t)cstotal.cs_nffree, + (intmax_t)cstotal.cs_nifree, + (intmax_t)cstotal.cs_numclusters); + } memmove(&fs->fs_cstotal, &cstotal, sizeof cstotal); fs->fs_ronly = 0; fs->fs_fmod = 0;