diff options
| author |   krw <krw@openbsd.org> | 2015-08-30 15:35:05 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2015-08-30 15:35:05 +0000 |
| commit | d3478487de73f36d18e6a9b92643ca67c817e4ac (patch) | |
| tree | 2a6d9083382aecf70f928104dbb7f17ad53d4a37 /sys/kern/subr_disk.c | |
| parent | Use a global table for domains instead of building a list at run time. (diff) | |
| download | wireguard-openbsd-d3478487de73f36d18e6a9b92643ca67c817e4ac.tar.xz wireguard-openbsd-d3478487de73f36d18e6a9b92643ca67c817e4ac.zip | |
Eliminate a couple of extraneous DL_SECTOBLK() calls.
The disklabel is either 0 bytes into a 512-byte disk sector, or 512
bytes into a larger disk sector. The address of the disk sector
read is irrelevant.
Pointed out by jsing@ I think. ok deraadt@
Diffstat (limited to 'sys/kern/subr_disk.c')
| -rw-r--r-- | sys/kern/subr_disk.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sys/kern/subr_disk.c b/sys/kern/subr_disk.c index e0e69d4dc5b..a7f93690808 100644 --- a/sys/kern/subr_disk.c +++ b/sys/kern/subr_disk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: subr_disk.c,v 1.193 2015/08/29 20:48:55 krw Exp $ */ +/* $OpenBSD: subr_disk.c,v 1.194 2015/08/30 15:35:05 krw Exp $ */ /* $NetBSD: subr_disk.c,v 1.17 1996/03/16 23:17:08 christos Exp $ */ /* @@ -536,8 +536,7 @@ notfat: if (biowait(bp)) return (bp->b_error); - offset = DL_BLKOFFSET(lp, DL_SECTOBLK(lp, dospartoff) + - DOS_LABELSECTOR); + offset = DL_BLKOFFSET(lp, DOS_LABELSECTOR); error = checkdisklabel(bp->b_data + offset, lp, DL_GETBSTART((struct disklabel*)(bp->b_data+offset)), DL_GETBEND((struct disklabel *)(bp->b_data+offset))); @@ -853,8 +852,7 @@ readgptlabel(struct buf *bp, void (*strat)(struct buf *), if (biowait(bp)) return (bp->b_error); - offset = DL_BLKOFFSET(lp, DL_SECTOBLK(lp, gptpartoff) + - DOS_LABELSECTOR); + offset = DL_BLKOFFSET(lp, DOS_LABELSECTOR); error = checkdisklabel(bp->b_data + offset, lp, DL_GETBSTART((struct disklabel*)(bp->b_data+offset)), DL_GETBEND((struct disklabel *)(bp->b_data+offset))); |