diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-06-06 16:39:50 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-06-06 16:39:50 +0000 |
| commit | 32d210caa068e883bc0c0c7804fd07bc1fefdcad (patch) | |
| tree | 1f05c9071813eb898a7a76cd3012a19ed2f5aa39 /sys/kern/subr_disk.c | |
| parent | 8200fcf12bfbd81bae3c2def060b450bde02379f (diff) | |
even more problems with disk size consistancy checks
Diffstat (limited to 'sys/kern/subr_disk.c')
| -rw-r--r-- | sys/kern/subr_disk.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/kern/subr_disk.c b/sys/kern/subr_disk.c index 1450de42c02..5d9c1159327 100644 --- a/sys/kern/subr_disk.c +++ b/sys/kern/subr_disk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: subr_disk.c,v 1.47 2007/06/05 00:38:23 deraadt Exp $ */ +/* $OpenBSD: subr_disk.c,v 1.48 2007/06/06 16:39:49 deraadt Exp $ */ /* $NetBSD: subr_disk.c,v 1.17 1996/03/16 23:17:08 christos Exp $ */ /* @@ -206,12 +206,12 @@ disklabeltokernlabel(struct disklabel *lp) pp->p_sizeh = 0; } +#ifdef notyet /* older broken sparc/sparc64 fake cyl-based disklabels fool this */ /* In a V1 label no partition extends past DL_GETSIZE(lp) - 1. */ if (DL_GETPOFFSET(pp) > DL_GETDSIZE(lp)) { pp->p_fstype = FS_UNUSED; DL_SETPSIZE(pp, 0); DL_SETPOFFSET(pp, 0); -#ifdef notyet /* older broken sparc/sparc64 fake cyl-based disklabels fool this */ } else if (DL_GETPOFFSET(pp) + DL_GETPSIZE(pp) > DL_GETDSIZE(lp)) { daddr64_t sz; |