From nobody Sun Dec 11 00:38:21 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 4NV5TV1b33z4jgsJ; Sun, 11 Dec 2022 00:38:22 +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 4NV5TT6W8Hz4Hk6; Sun, 11 Dec 2022 00:38:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670719101; 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=3SL1M5MZsFAiMt2+eLMTpLey2Ajx31Eb8kkvxtm7Lgg=; b=wdA8tkSZMHc7mxkbXoSR4cWuDS1quYq2dHx7CaQWaq4wn23LnXIZ/yn7ZzbyhctmIeVlag 35nn+8VkTGh4y1rONTneeao8q3Gd6lFoG1rSWJqVVRkr4Tncezd9YmvC6IRnJ8AdbxPLGC qOFDYdm3bjGJT8+YQUfpWpJf/c8LKy9DOMfKLWA/T+1xRwwbdyfq+amo4ZcN3EEl+Y1G79 JYNA2UOXN/QFse+ldXHiXw7umlmTm651UD3IR7uZjGzCVakS1dprZZFu5m2bH1q4Cz/X9i b9HZjU5rvkItVLXTaYaGlDRZnPDoumLyuJa3LqexG3N3m71cY1bH+YL8zY2l1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670719101; 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=3SL1M5MZsFAiMt2+eLMTpLey2Ajx31Eb8kkvxtm7Lgg=; b=oVlnZaN/3SzqG6wovM6ZAgEPhS3jtqWp49xiU7xQriJ+IzUtHKTEy7Kdd6SDl1W58t6WJa OoQ9+TtRGkcO2NMW519tvTrJpaIEUuGCTa723M4a34d6BBoVKr4vWvA4RQSEKYbw278wT+ +pdMjJJZ57VW1bRDCprxWxFOSXinhm3jdNSypgNLlY820qjg5wSpvjDt/gjUrd9oGLJ0cp ARDIR9NVVvJBjTbrbebXfaHoBdv9DxJjNxEm1MdV+fT9py3KiDwMaZ5UiiEM7xVy7v34JT LjIXLxr7G20Vcvvv/OaXnX6weDDewyF9rLU++0w3x4TZKWZpAFoXDZxdAHlxGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670719101; a=rsa-sha256; cv=none; b=fKDpbohhKIoO/lPAF2rKMqPMKKatESM3tudGW5kRPvOi2tIzarAOf3PMSV7IeWh5+uHF+R lrYEcUT5+PwJe5XHm+g3cnEhac6PrgbViQmc8w+vUsCiStl/cNiPBucBpBWNkNIOyHVKwX 9CSzRDUBW9ediB1cuoIj9x6h45iIccFFXeM7FT3heMuJ3bBR4yk5gBqcoNj3PQixC7yZEM hWO0YVWgUCk1f/+uhn7MycK92ZoNYeKjkyynhrm1tc81S1yqwHyXRv2aVl/MVBauXE7lWV fjG6yWSqqJgWGywN+DCaWlFmAuKA3SWCQMqqSW+l9diqlj0gwioYgT+fy1ZtUQ== 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 4NV5TT5csKzbgj; Sun, 11 Dec 2022 00:38:21 +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 2BB0cLFS004009; Sun, 11 Dec 2022 00:38:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BB0cL8f004008; Sun, 11 Dec 2022 00:38:21 GMT (envelope-from git) Date: Sun, 11 Dec 2022 00:38:21 GMT Message-Id: <202212110038.2BB0cL8f004008@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: f08305316072 - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: f08305316072e2298d5f7d93e66fac226b2ec6c2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=f08305316072e2298d5f7d93e66fac226b2ec6c2 commit f08305316072e2298d5f7d93e66fac226b2ec6c2 Author: Kirk McKusick AuthorDate: 2022-09-05 19:06:58 +0000 Commit: Kirk McKusick CommitDate: 2022-12-11 00:37:17 +0000 Formatting cleanups and debugging fix. (cherry picked from commit 4b4cc78a762cd381111207a53ec094dd8d714506) 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 923a945fc104..4a7a6b7a2574 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; @@ -470,7 +470,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) @@ -1265,9 +1265,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); } /*