From b59de1dbbb9fec4564d609d8ae32ab3686fe4c98 Mon Sep 17 00:00:00 2001 From: mckusick Date: Thu, 2 May 2002 01:03:06 +0000 Subject: Minor bug fixes uncovered while working on UFS2. They should have no effect on existing systems. --- sbin/fsck_ffs/fsutil.c | 2 +- sbin/fsck_ffs/pass5.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'sbin/fsck_ffs') diff --git a/sbin/fsck_ffs/fsutil.c b/sbin/fsck_ffs/fsutil.c index 2595b16..65869c3 100644 --- a/sbin/fsck_ffs/fsutil.c +++ b/sbin/fsck_ffs/fsutil.c @@ -195,7 +195,6 @@ getdatablk(ufs_daddr_t blkno, long size) getblk(bp, blkno, size); /* fall through */ foundit: - totalreads++; bp->b_prev->b_next = bp->b_next; bp->b_next->b_prev = bp->b_prev; bp->b_prev = &bufhead; @@ -211,6 +210,7 @@ getblk(struct bufarea *bp, ufs_daddr_t blk, long size) { ufs_daddr_t dblk; + totalreads++; dblk = fsbtodb(&sblock, blk); if (bp->b_bno != dblk) { flush(fswritefd, bp); diff --git a/sbin/fsck_ffs/pass5.c b/sbin/fsck_ffs/pass5.c index e927ff5..1d73dc8 100644 --- a/sbin/fsck_ffs/pass5.c +++ b/sbin/fsck_ffs/pass5.c @@ -186,7 +186,7 @@ pass5(void) dmax = fs->fs_size; newcg->cg_time = cg->cg_time; newcg->cg_cgx = c; - if (c == fs->fs_ncg - 1) + if (c == fs->fs_ncg - 1 && fs->fs_ncyl % fs->fs_cpg > 0) newcg->cg_ncyl = fs->fs_ncyl % fs->fs_cpg; else newcg->cg_ncyl = fs->fs_cpg; -- cgit v1.1