 @@ -1,14 +1,14 @@
-/*	$NetBSD: disksubr.c,v 1.26 2015/07/04 06:14:41 maxv Exp $	*/
+/*	$NetBSD: disksubr.c,v 1.27 2017/03/05 22:14:51 mrg Exp $	*/
 /*-
  * Copyright (c) 2010 Frank Wille.
  * All rights reserved.
+ *
  * Written by Frank Wille for The NetBSD Project.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -53,27 +53,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)ufs_disksubr.c	7.16 (Berkeley) 5/4/91
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.26 2015/07/04 06:14:41 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.27 2017/03/05 22:14:51 mrg Exp $");
 #include "opt_disksubr.h"
 #include <sys/buf.h>
 #include <sys/disklabel.h>
 #include <sys/bswap.h>
 /*
  * In /usr/src/sys/dev/scsipi/sd.c, routine sdstart() adjusts the
  * block numbers, it changes from DEV_BSIZE units to physical units:
  * blkno = bp->b_blkno / (lp->d_secsize / DEV_BSIZE);
  * As long as media with sector sizes of 512 bytes are used, this
  * doesn't matter (divide by 1), but for successful usage of media with
 @@ -327,45 +327,45 @@ read_rdb_label(dev_t dev, void (*strat)(
 	 */
 	if (rbp->highcyl == 0)
 		lp->d_ncylinders = rbp->ncylinders;
 	else
 		lp->d_ncylinders = rbp->highcyl + 1;
 	/*
 	 * I also don't trust rdb->secpercyl
 	 */
 	lp->d_secpercyl = min(rbp->secpercyl, lp->d_nsectors * lp->d_ntracks);
 	if (lp->d_secpercyl == 0)
 		lp->d_secpercyl = lp->d_nsectors * lp->d_ntracks;
 #ifdef DIAGNOSTIC
 	if (lp->d_ncylinders != rbp->ncylinders)
-		printf("warning found rdb->ncylinders(%ld) != "
+		printf("warning found rdb->ncylinders(%u) != "
-		    "rdb->highcyl(%ld) + 1\n", rbp->ncylinders,
+		    "rdb->highcyl(%u) + 1\n", rbp->ncylinders,
 		    rbp->highcyl);
 	if (lp->d_nsectors * lp->d_ntracks != rbp->secpercyl)
-		printf("warning found rdb->secpercyl(%ld) != "
+		printf("warning found rdb->secpercyl(%u) != "
-		    "rdb->nsectors(%ld) * rdb->nheads(%ld)\n", rbp->secpercyl,
+		    "rdb->nsectors(%u) * rdb->nheads(%u)\n", rbp->secpercyl,
 		    rbp->nsectors, rbp->nheads);
 #endif
 	lp->d_sparespercyl =
 	    max(rbp->secpercyl, lp->d_nsectors * lp->d_ntracks)
 	    - lp->d_secpercyl;
 	if (lp->d_sparespercyl == 0)
 		lp->d_sparespertrack = 0;
 	else {
 		lp->d_sparespertrack = lp->d_sparespercyl / lp->d_ntracks;
 #ifdef DIAGNOSTIC
 		if (lp->d_sparespercyl % lp->d_ntracks)
-			printf("warning lp->d_sparespercyl(%d) not multiple "
+			printf("warning lp->d_sparespercyl(%u) not multiple "
-			    "of lp->d_ntracks(%d)\n", lp->d_sparespercyl,
+			    "of lp->d_ntracks(%u)\n", lp->d_sparespercyl,
 			    lp->d_ntracks);
 #endif
+	}
 	lp->d_secperunit = lp->d_secpercyl * lp->d_ncylinders;
 	lp->d_acylinders = rbp->ncylinders - (rbp->highcyl - rbp->lowcyl + 1);
 	lp->d_rpm = 3600; 		/* good guess I suppose. */
 	lp->d_interleave = rbp->interleave;
 	lp->d_headswitch = lp->d_flags = lp->d_trackskew = lp->d_cylskew = 0;
 	lp->d_trkseek = /* rbp->steprate */ 0;
 	/*
 	 * raw partition gets the entire disk
 @@ -456,30 +456,30 @@ read_rdb_label(dev_t dev, void (*strat)(
 			pp = &lp->d_partitions[lp->d_npartitions];
 			break;
+		}
 		if (lp->d_npartitions <= (pp - lp->d_partitions))
 			lp->d_npartitions = (pp - lp->d_partitions) + 1;
 #ifdef DIAGNOSTIC
 		if (lp->d_secpercyl * lp->d_secsize !=
 		    (pbp->e.secpertrk * pbp->e.numheads * pbp->e.sizeblock<<2)) {
 			if (pbp->partname[0] < sizeof(pbp->partname))
 				pbp->partname[pbp->partname[0] + 1] = 0;
 			else
 				pbp->partname[sizeof(pbp->partname) - 1] = 0;
-			printf("Partition '%s' geometry %ld/%ld differs",
+			printf("Partition '%s' geometry %u/%u differs",
 			    pbp->partname + 1, pbp->e.numheads,
 			    pbp->e.secpertrk);
-			printf(" from RDB %d/%d=%d\n", lp->d_ntracks,
+			printf(" from RDB %u/%u=%u\n", lp->d_ntracks,
 			    lp->d_nsectors, lp->d_secpercyl);
+		}
 #endif
 		/*
 		 * insert sort in increasing offset order
 		 */
 		while ((pp - lp->d_partitions) > RAW_PART + 1) {
 			daddr_t boff;
 			boff = pbp->e.lowcyl * pbp->e.secpertrk
 			    * pbp->e.numheads;
 			if (boff > (pp - 1)->p_offset)
 				break;