git: 4b4cc78a762c - main - Formatting cleanups and debugging fix.

The branch main has been updated by mckusick:

URL: https://cgit.FreeBSD.org/src/commit/?id=4b4cc78a762cd381111207a53ec094dd8d714506

commit 4b4cc78a762cd381111207a53ec094dd8d714506
Author:     Kirk McKusick <mckusick@FreeBSD.org>
AuthorDate: 2022-09-05 19:06:58 +0000
Commit:     Kirk McKusick <mckusick@FreeBSD.org>
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);
 }
 
 /*