From 0595d28a7bc0d5da51d6f1449f7839577afd02ed Mon Sep 17 00:00:00 2001 From: miod Date: Fri, 16 Jan 2015 20:18:24 +0000 Subject: [PATCH] Revert forcing a rachitic `c' slice size when the drive geometry is not known, now that the disklabel code will reduce MAXDISKSIZE to the real size if a Sun label is found. --- sys/arch/sparc/dev/xd.c | 4 +--- sys/arch/sparc/dev/xy.c | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/sys/arch/sparc/dev/xd.c b/sys/arch/sparc/dev/xd.c index eb6347a6fd3..13bf6f1498c 100644 --- a/sys/arch/sparc/dev/xd.c +++ b/sys/arch/sparc/dev/xd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xd.c,v 1.70 2015/01/15 21:17:54 miod Exp $ */ +/* $OpenBSD: xd.c,v 1.71 2015/01/16 20:18:24 miod Exp $ */ /* $NetBSD: xd.c,v 1.37 1997/07/29 09:58:16 fair Exp $ */ /* @@ -295,8 +295,6 @@ xdgetdisklabel(dev, xd, lp, spoofonly) if (xd->state == XD_DRIVE_ATTACHING || xd->state == XD_DRIVE_NOLABEL) { /* needs to be nonzero */ lp->d_secpercyl = 1; - /* prevent initdisklabel() from putting MAXDISKSIZE */ - DL_SETDSIZE(lp, 1ULL); } else { /* * Disk geometry is known from a previously found label. diff --git a/sys/arch/sparc/dev/xy.c b/sys/arch/sparc/dev/xy.c index e70bed8b057..00d25d94f04 100644 --- a/sys/arch/sparc/dev/xy.c +++ b/sys/arch/sparc/dev/xy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xy.c,v 1.67 2015/01/15 21:17:54 miod Exp $ */ +/* $OpenBSD: xy.c,v 1.68 2015/01/16 20:18:24 miod Exp $ */ /* $NetBSD: xy.c,v 1.26 1997/07/19 21:43:56 pk Exp $ */ /* @@ -233,8 +233,6 @@ xygetdisklabel(dev, xy, lp, spoofonly) if (xy->state == XY_DRIVE_ATTACHING || xy->state == XY_DRIVE_NOLABEL) { /* needs to be nonzero */ lp->d_secpercyl = 1; - /* prevent initdisklabel() from putting MAXDISKSIZE */ - DL_SETDSIZE(lp, 1ULL); } else { /* * Disk geometry is known for a previously found label. -- 2.20.1