Module Name:    src
Committed By:   rin
Date:           Sat Feb 25 22:45:59 UTC 2017

Modified Files:
        src/sys/arch/amiga/amiga: disksubr.c

Log Message:
multiply the missing factor to offset when sorting partitions
(harmless for ``normal'' disks although)


To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/sys/arch/amiga/amiga/disksubr.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/amiga/amiga/disksubr.c
diff -u src/sys/arch/amiga/amiga/disksubr.c:1.64 src/sys/arch/amiga/amiga/disksubr.c:1.65
--- src/sys/arch/amiga/amiga/disksubr.c:1.64	Sat Feb 25 22:40:18 2017
+++ src/sys/arch/amiga/amiga/disksubr.c	Sat Feb 25 22:45:59 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: disksubr.c,v 1.64 2017/02/25 22:40:18 rin Exp $	*/
+/*	$NetBSD: disksubr.c,v 1.65 2017/02/25 22:45:59 rin Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@@ -66,7 +66,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.64 2017/02/25 22:40:18 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.65 2017/02/25 22:45:59 rin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -396,7 +396,8 @@ readdisklabel(dev_t dev, void (*strat)(s
 			daddr_t boff;
 
 			boff = pbp->e.lowcyl * pbp->e.secpertrk
-			    * pbp->e.numheads;
+			    * pbp->e.numheads
+			    * ((pbp->e.sizeblock << 2) / lp->d_secsize);
 			if (boff > (pp - 1)->p_offset)
 				break;
 			*pp = *(pp - 1);	/* struct copy */

Reply via email to