From 2cc175b47fdbe3ead685195b57a7a8c9ccdf3541 Mon Sep 17 00:00:00 2001 From: jsing Date: Sat, 12 Jul 2014 17:50:36 +0000 Subject: [PATCH] Remove the temporary dospartoff work around. From Markus Mueller. ok krw@ miod@ tedu@ --- sys/kern/subr_disk.c | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/sys/kern/subr_disk.c b/sys/kern/subr_disk.c index 28d94942358..5979a3ff4be 100644 --- a/sys/kern/subr_disk.c +++ b/sys/kern/subr_disk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: subr_disk.c,v 1.165 2014/07/11 14:36:44 uebayasi Exp $ */ +/* $OpenBSD: subr_disk.c,v 1.166 2014/07/12 17:50:36 jsing Exp $ */ /* $NetBSD: subr_disk.c,v 1.17 1996/03/16 23:17:08 christos Exp $ */ /* @@ -526,24 +526,6 @@ notfat: error = checkdisklabel(bp->b_data + offset, lp, DL_GETBSTART((struct disklabel*)(bp->b_data+offset)), DL_GETBEND((struct disklabel *)(bp->b_data+offset))); - /* XXX Remove after 5.5. It's meant for a short sharp transition! */ - if (error == ENOENT && lp->d_secsize != DEV_BSIZE) { - /* - * Try looking at the (wrong but previously used) location - * specified if dospartoff is considered a DEV_BSIZE address. - */ - bp->b_blkno = DL_BLKTOSEC(lp, dospartoff + DOS_LABELSECTOR) * - DL_BLKSPERSEC(lp); - offset = DL_BLKOFFSET(lp, dospartoff + DOS_LABELSECTOR); - bp->b_bcount = lp->d_secsize; - CLR(bp->b_flags, B_READ | B_WRITE | B_DONE); - SET(bp->b_flags, B_BUSY | B_READ | B_RAW); - (*strat)(bp); - if (biowait(bp)) - return (bp->b_error); - error = checkdisklabel(bp->b_data + offset, lp, dospartoff, - dospartend); - } return (error); } -- 2.20.1