From nobody Mon Sep 5 19:08:15 2022 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 4MLyhw1xgmz4bPNV; Mon, 5 Sep 2022 19:08:16 +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 4MLyhw1DHTz4GcP; Mon, 5 Sep 2022 19:08:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662404896; 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=uQgq8az0xVZ8A3QK9v/T26BkNQIPKgORcXbtwidOpOI=; b=OpKXmKD/r4xiQI+3p9eg61YXWJUOOWx8T3Xby6SF8QkqBwBN4aikt/fxKxph5jtbG0ehEj YxeQ2egFbJQRfQZgM8BLAzAhuJgSs6SD9kBTwWR+rbc7NHLqBGK/fO6qiQBr8UL9s5xP/7 D0xYVdVeJR/LomzWEqHkcDMxnxAX4g3CC9COL98NTaZ5zv/UStvqURs6ep3LOJZE9mAUIa ZB8DbMSDRvSCsKaNZuU1sTXcN5gtLdtaK3Q1ajw0LGeY+NSvnbwNZ79J9ZCZ99SeOp9E8J 4NHnhINOXd5rm8FeYBzcu3lZlBXeS6c3lLUzgH2z9BXfEeyI1h5wjXrJvROUIw== 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 4MLyhw05Kyzvlg; Mon, 5 Sep 2022 19:08:16 +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 285J8Ffw012716; Mon, 5 Sep 2022 19:08:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 285J8FDE012715; Mon, 5 Sep 2022 19:08:15 GMT (envelope-from git) Date: Mon, 5 Sep 2022 19:08:15 GMT Message-Id: <202209051908.285J8FDE012715@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: 4b4cc78a762c - main - Formatting cleanups and debugging fix. 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: 4b4cc78a762cd381111207a53ec094dd8d714506 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662404896; 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=uQgq8az0xVZ8A3QK9v/T26BkNQIPKgORcXbtwidOpOI=; b=yqTFnQmlbynv7v4bG7v5GTaVki4PbqUMAPistz7xbK7OU88HOiH0MLbvAAJ8BDI0RW8bAf fGe/mNvZBCDpX5ySINjdpFf1uXnnb72BD09LayNVY4gNMKcwkKaFeSS8oohMAL0OmYwc5F mqJ9ngchoVDOrb1JAVQEn0Gm884hu+Zx/psYcE8v7vfsgHnvxIGs4dh/uQPkG8PxPXeyAs YTYnMsblcpbhx5x5oXqjOF67Gw76TH5j72J7EKVqAAXKcVk4M9WUMwopYkbK/POTE3J210 mEURueQ6Iyi8mrl9iL1KlYlQaPtE2YxemJk9C7eyOBViUCpNOT2pmaMW5Gotlg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662404896; a=rsa-sha256; cv=none; b=TwcUxImeKcNnxFQupKsaIU7EfwlZeIkq6yZmX9TnXajih+7DvK3a7+mb3DNGKYkL40+PAq 15YQnGimudLGQsPCQG5rt7HMPzvUXNkppnOHcNqaIbRhBTqtSIytFXtnTpH6jqlXUVJEbB rOTc8RdqonsX5mx+q7iJKxo4Vx1D3NqKhza4hlJKMIIELqao76If1kV8Mrr2Pbhb/38QH7 M3bZ/9/SR+tPpdkWqZx71frlU18KQXoftQ4T74BEv90a4w+RSMYHT01aSdYHvzqc/PoSCQ Rws7UlYoZ6pMtnTT6oaOMVpKEWWPMO+mpiOgKc8PIJF1EMFgFoqYZt7SWQF1lw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=4b4cc78a762cd381111207a53ec094dd8d714506 commit 4b4cc78a762cd381111207a53ec094dd8d714506 Author: Kirk McKusick AuthorDate: 2022-09-05 19:06:58 +0000 Commit: Kirk McKusick CommitDate: 2022-09-05 19:07:48 +0000 Formatting cleanups and debugging fix. Sponsored by: The FreeBSD Foundation --- sbin/fsck_ffs/fsutil.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sbin/fsck_ffs/fsutil.c b/sbin/fsck_ffs/fsutil.c index aa1bfb32ab5b..f1834e1235d8 100644 --- a/sbin/fsck_ffs/fsutil.c +++ b/sbin/fsck_ffs/fsutil.c @@ -81,9 +81,9 @@ int slowio_pollcnt; static struct bufarea cgblk; /* backup buffer for cylinder group blocks */ static TAILQ_HEAD(bufqueue, bufarea) bufqueuehd; /* head of buffer cache LRU */ static LIST_HEAD(bufhash, bufarea) bufhashhd[HASHSIZE]; /* buffer hash list */ -static int numbufs; /* size of buffer cache */ -static int cachelookups; /* number of cache lookups */ -static int cachereads; /* number of cache reads */ +static int numbufs; /* size of buffer cache */ +static int cachelookups; /* number of cache lookups */ +static int cachereads; /* number of cache reads */ static int flushtries; /* number of tries to reclaim memory */ char *buftype[BT_NUMBUFTYPES] = BT_NAMES; @@ -471,7 +471,7 @@ flush(int fd, struct bufarea *bp) pwarn("flush: INODE CHECK-HASH FAILED"); ip.i_bp = bp; ip.i_dp = (union dinode *)dp; - ip.i_number = bp->b_index + i; + ip.i_number = bp->b_index + (i / sizeof(*dp)); prtinode(&ip); if (preen || reply("FIX") != 0) { if (preen) @@ -1266,9 +1266,9 @@ prtbuf(const char *msg, struct bufarea *bp) { printf("%s: bp %p, type %s, bno %jd, size %d, refcnt %d, flags %s, " - "index %jd\n", msg, bp, BT_BUFTYPE(bp->b_type), (intmax_t) bp->b_bno, - bp->b_size, bp->b_refcnt, bp->b_flags & B_DIRTY ? "dirty" : "clean", - (intmax_t) bp->b_index); + "index %jd\n", msg, bp, BT_BUFTYPE(bp->b_type), + (intmax_t) bp->b_bno, bp->b_size, bp->b_refcnt, + bp->b_flags & B_DIRTY ? "dirty" : "clean", (intmax_t) bp->b_index); } /*