From nobody Sat Aug 5 06:14:39 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 4RHsk73mPRz4phbC; Sat, 5 Aug 2023 06:14:39 +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 4RHsk73FKYz4c5X; Sat, 5 Aug 2023 06:14:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691216079; 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=PCfYfRnxheecy6xp+eXUXivB4quqoOiXYYueKDgNOb8=; b=du9nX+uLQSvoWZ5CvWwsy2GfGuqfw08ptcKduDDcZ4xOT50yL7zd2FKiSPRCgqFsylyseJ 39M5MYUWuPeg+R6waXo9IYvxkIujPJdQm5q+N/ooKN6mbYcJCxIJuZW+2nB0aJrxlaRntN tQ3aQOG3WAHn0Ifw+sMn///WFdh7UHcaGFL+45crBP7zG0JRD5zIdOiSAhRUB9Ph4LyNAs m+3O+BeE++dty1NwEtSH5wfErWm/LNdGKFxzxJ6Nwz4LuTtYRQyDRmlEa4qlzPXKqRh0fT k0Fzp7xyspVexy3D6miob96wNxHknXxj8W/OxgMMH141WL9QNOcRulqqYb+0fg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691216079; 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=PCfYfRnxheecy6xp+eXUXivB4quqoOiXYYueKDgNOb8=; b=WQU3wOBsMq43Wopn5Uv1INpWlSR6BoKRxwAvz7SntXLSmnSntBYPjtsaX8m1FAvjXAl5Vi tJZZeBoM+TNRyT46jZaQ2gNvrmE0NHkAsKWTwuA8t73w4JbKFduvnY4rst3HRwUDXmkMd9 UlKlK420gHlV0CdwnIMIuUoYec0nw3txRehvsPoTY+HB+qPpYhyoneBRvoOTRzNiqfK4Ej yA6+D4diiBQ3kWuxoAHf1tSInzLiHrer4fKSewsCb417+CnFfcfsoUHO/WdQSyDobNtx0Q Ep2DJDkXzZVDFn28ILCNDbV+YVq7OgzR14SuVN/deKy/ifUQ0L9ju0+1dZppoA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691216079; a=rsa-sha256; cv=none; b=hoh+AKP++zqxoJR1Y/OP17s6J4AjuKP7Gx/SdVpV3qh5u0DVcuCJHMYX88sIu2bHU5d6Ag yS5EZsc3YNvk+Ge+kQoc6dzcliPkKSg5Z3ZrFDTCRAQdZZ0AT8IK9V1VWe1KcW907t+Apr Q55qlISQRFZVz+e+Oer36+4sbCZiRtl02Ov7Tct4OF0fL9mlZx6sfj3psMjkaMZF68GOBg bxZk4ikPm2fZeYJGu9869DCZ/QTElUfnYgTnCV5AuSBaXORgVB3YjOl7VyEg6Ik8ECGbPn krZMqB/io8MlCDpqOxE+PZwrEgT0NENKxhS7LECUdbZcNfcHe8TPLnDpptAffQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RHsk72JP6z3l8; Sat, 5 Aug 2023 06:14:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3756Ed4j010553; Sat, 5 Aug 2023 06:14:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3756Ed42010552; Sat, 5 Aug 2023 06:14:39 GMT (envelope-from git) Date: Sat, 5 Aug 2023 06:14:39 GMT Message-Id: <202308050614.3756Ed42010552@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: f40d616aecd7 - stable/13 - Debugging output additions. No functional changes intended. 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/stable/13 X-Git-Reftype: branch X-Git-Commit: f40d616aecd777803d8856b6c6e381b983fc69ae Auto-Submitted: auto-generated The branch stable/13 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=f40d616aecd777803d8856b6c6e381b983fc69ae commit f40d616aecd777803d8856b6c6e381b983fc69ae Author: Kirk McKusick AuthorDate: 2023-07-25 21:02:33 +0000 Commit: Kirk McKusick CommitDate: 2023-08-05 06:13:25 +0000 Debugging output additions. No functional changes intended. Sponsored-by: The FreeBSD Foundation (cherry picked from commit 4d512b07357f6a4feff8ac266f90d34939a57be4) --- sbin/fsck_ffs/main.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/sbin/fsck_ffs/main.c b/sbin/fsck_ffs/main.c index dab614d61bf4..a0746ea0f68e 100644 --- a/sbin/fsck_ffs/main.c +++ b/sbin/fsck_ffs/main.c @@ -438,7 +438,7 @@ checkfilesys(char *filesys) /* * 1: scan inodes tallying blocks used */ - if (preen == 0) { + if (preen == 0 || debug) { printf("** Last Mounted on %s\n", sblock.fs_fsmnt); if (mntp != NULL && mntp->f_flags & MNT_ROOTFS) printf("** Root file system\n"); @@ -457,7 +457,8 @@ checkfilesys(char *filesys) preen ? "-p" : "", (preen && usedsoftdep) ? " AND " : "", usedsoftdep ? "SOFTUPDATES" : ""); - printf("** Phase 1b - Rescan For More DUPS\n"); + if (preen == 0 || debug) + printf("** Phase 1b - Rescan For More DUPS\n"); pass1b(); IOstats("Pass1b"); } @@ -465,7 +466,7 @@ checkfilesys(char *filesys) /* * 2: traverse directories from root to mark all connected directories */ - if (preen == 0) + if (preen == 0 || debug) printf("** Phase 2 - Check Pathnames\n"); pass2(); IOstats("Pass2"); @@ -473,7 +474,7 @@ checkfilesys(char *filesys) /* * 3: scan inodes looking for disconnected directories */ - if (preen == 0) + if (preen == 0 || debug) printf("** Phase 3 - Check Connectivity\n"); pass3(); IOstats("Pass3"); @@ -481,7 +482,7 @@ checkfilesys(char *filesys) /* * 4: scan inodes looking for disconnected files; check reference counts */ - if (preen == 0) + if (preen == 0 || debug) printf("** Phase 4 - Check Reference Counts\n"); pass4(); IOstats("Pass4"); @@ -489,7 +490,7 @@ checkfilesys(char *filesys) /* * 5: check and repair resource counts in cylinder groups */ - if (preen == 0) + if (preen == 0 || debug) printf("** Phase 5 - Check Cyl groups\n"); snapflush(std_checkblkavail); if (cgheader_corrupt) {