From nobody Tue Jul 25 21:04:06 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 4R9TzV2t8hz4nnWS; Tue, 25 Jul 2023 21:04:06 +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 4R9TzV2Pz4z3sbw; Tue, 25 Jul 2023 21:04:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690319046; 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=5V8PeVhC8xKG6WI4ixcNRG2NrvSZ3Fqh3mzOPEyhO4w=; b=AuhpRMnzlZSU/YfNqAfcQIab8rbLVdC4QxxjQvJbHHGBWOubCwyoU6JAAVMZ4B6xyPnQty Oi/VJejSlW7QLTiZ0vCHF3xj2QmHXU+zGfCvVKlXpLtCoJSokWB6DbZ+s3r2BUuX3/tgzn cfNj4ohokYIVbwOZSXqd2o8zDTLW73ZroVp/6UkA8ZXwilQlUoU70FbuSn4Sr26yGgxDV5 vJoIbiUNL97kR7Y7Xe4cASf0SOxhpij84HUnHUhcvVfJkISmW8mgRA3bVC7XYv+fCKihL3 6TaR4C1bemKc65LYL9akcVNtnwrFnCkwaEk4M8Lkk/QAAHz9ObEybfvTD1Rnxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690319046; 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=5V8PeVhC8xKG6WI4ixcNRG2NrvSZ3Fqh3mzOPEyhO4w=; b=dDo/hSM3GhLAxYjOfhxExZ9MTrQ+STHlYYvDUqOieFXfjD2qU+5DcFcJi8ZXgLSMvGAdM5 vl6zwwHvKsVnse4dyc6qEFwEgDu8ysiPLlgIl7sAQ2YwAWzERnJY+EHMZ7/uxB6uYYQh6B rYsYYCAvKUt/hSEbQ/xmG2m2hsn0V5RElKlCurleseAm+3Top8RoTT2rLr/pjyNmzJetrd /kjZFfuv4NWnlxRDhZix/vr26kIJXd2qWVsyYd3NEvrqSljkHCdUhvZcCn/RLlY3ANnEk0 65zh9dTf8E4p8VRchnqhRWwiZ411KycxW9eQpraZBHxO+TVLnVBiCgve7e9/rQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690319046; a=rsa-sha256; cv=none; b=iwSQ7FNSqmqSPKiQxHXCzXVVAo5y8LPd+mr1cXgUgxZrWpmyJYSSU+MMgeNahr79TFBjro xYOY/+TSmpMfk2ewX97sUQG5o62RByn81Hhs+rPNtzIHMItERx+O3nOrS6sEftXlYr6xQJ er22clFAPu2XRMbR1asIyJbul14O/L7RnHDE3i9p2TFkmr5dYHP3NeB41JC9xBAx1R2e2c S5I8zzQr6bwxMjGXonOkqblDlrg5ReUkDlod81p11PvKtlmImh6gevtaDPENTgKfnOFIBS QOo8qrPA0Wz08c+X3Omnvbb1JOZPUzs6aoDAsZorcnVKjdJD1kFRVdtj4sjDhA== 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 4R9TzV1TLRzFpC; Tue, 25 Jul 2023 21:04:06 +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 36PL46n7096847; Tue, 25 Jul 2023 21:04:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36PL46b0096846; Tue, 25 Jul 2023 21:04:06 GMT (envelope-from git) Date: Tue, 25 Jul 2023 21:04:06 GMT Message-Id: <202307252104.36PL46b0096846@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: 4d512b07357f - main - 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/main X-Git-Reftype: branch X-Git-Commit: 4d512b07357f6a4feff8ac266f90d34939a57be4 Auto-Submitted: auto-generated The branch main has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=4d512b07357f6a4feff8ac266f90d34939a57be4 commit 4d512b07357f6a4feff8ac266f90d34939a57be4 Author: Kirk McKusick AuthorDate: 2023-07-25 21:02:33 +0000 Commit: Kirk McKusick CommitDate: 2023-07-25 21:03:43 +0000 Debugging output additions. No functional changes intended. MFC-after: 1 week Sponsored-by: The FreeBSD Foundation --- 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 56883d682ce8..0acf7e709180 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) {