diff options
| author |   krw <krw@openbsd.org> | 2013-10-14 23:35:53 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2013-10-14 23:35:53 +0000 |
| commit | fb279075f833aeb81f3d5b7d7627b849d76ec0e1 (patch) | |
| tree | 552aa525af552b3176b471504a5801d6e9b90357 /sys/kern/subr_disk.c | |
| parent | Use DL_SECTOBLK() instead of handrolling same calculation to get (diff) | |
| download | wireguard-openbsd-fb279075f833aeb81f3d5b7d7627b849d76ec0e1.tar.xz wireguard-openbsd-fb279075f833aeb81f3d5b7d7627b849d76ec0e1.zip | |
Display correct values (i.e. blocks where blocks are meant) in
diskerr() messages by doing DL_SECTOBLK() dance repeatedly.
Diffstat (limited to 'sys/kern/subr_disk.c')
| -rw-r--r-- | sys/kern/subr_disk.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/kern/subr_disk.c b/sys/kern/subr_disk.c index 1ce7e676e59..155f3eb0983 100644 --- a/sys/kern/subr_disk.c +++ b/sys/kern/subr_disk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: subr_disk.c,v 1.153 2013/10/07 22:11:49 krw Exp $ */ +/* $OpenBSD: subr_disk.c,v 1.154 2013/10/14 23:35:53 krw Exp $ */ /* $NetBSD: subr_disk.c,v 1.17 1996/03/16 23:17:08 christos Exp $ */ /* @@ -774,12 +774,12 @@ diskerr(struct buf *bp, char *dname, char *what, int pri, int blkdone, bp->b_blkno + (bp->b_bcount - 1) / DEV_BSIZE); } if (lp && (blkdone >= 0 || bp->b_bcount <= lp->d_secsize)) { - sn += DL_GETPOFFSET(&lp->d_partitions[part]); + sn += DL_SECTOBLK(lp, DL_GETPOFFSET(&lp->d_partitions[part])); (*pr)(" (%s%d bn %lld; cn %lld", dname, unit, sn, - sn / lp->d_secpercyl); - sn %= lp->d_secpercyl; - (*pr)(" tn %lld sn %lld)", sn / lp->d_nsectors, - sn % lp->d_nsectors); + sn / DL_SECTOBLK(lp, lp->d_secpercyl)); + sn %= DL_SECTOBLK(lp, lp->d_secpercyl); + (*pr)(" tn %lld sn %lld)", sn / DL_SECTOBLK(lp, lp->d_nsectors), + sn % DL_SECTOBLK(lp, lp->d_nsectors)); } } |