 @@ -1,14 +1,14 @@
-/*	$NetBSD: ld.c,v 1.67 2010/08/19 17:59:10 jmcneill Exp $	*/
+/*	$NetBSD: ld.c,v 1.68 2010/09/20 06:54:06 kiyohara Exp $	*/
 /*-
  * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Doran and Charles M. Hannum.
+ *
  * 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.
 @@ -24,27 +24,27 @@
  * 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.
  */
 /*
  * Disk driver for use by RAID controllers.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld.c,v 1.67 2010/08/19 17:59:10 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld.c,v 1.68 2010/09/20 06:54:06 kiyohara Exp $");
 #include "rnd.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/queue.h>
 #include <sys/proc.h>
 #include <sys/buf.h>
 #include <sys/bufq.h>
 #include <sys/endian.h>
 #include <sys/disklabel.h>
 @@ -135,26 +135,27 @@ ldattach(struct ld_softc *sc)
 		sc->sc_ncylinders = INT_MAX;
 		ncyl = sc->sc_secperunit /
 		    (sc->sc_nheads * sc->sc_nsectors);
 		if (ncyl < INT_MAX)
 			sc->sc_ncylinders = (int)ncyl;
+	}
 	format_bytes(tbuf, sizeof(tbuf), sc->sc_secperunit *
 	    sc->sc_secsize);
 	aprint_normal_dev(sc->sc_dv, "%s, %d cyl, %d head, %d sec, "
 	    "%d bytes/sect x %"PRIu64" sectors\n",
 	    tbuf, sc->sc_ncylinders, sc->sc_nheads,
 	    sc->sc_nsectors, sc->sc_secsize, sc->sc_secperunit);
 	sc->sc_disksize512 = sc->sc_secperunit * sc->sc_secsize / DEV_BSIZE;
 	ld_set_properties(sc);
 #if NRND > 0
 	/* Attach the device into the rnd source list. */
 	rnd_attach_source(&sc->sc_rnd_source, device_xname(sc->sc_dv),
 	    RND_TYPE_DISK, 0);
 #endif
 	/* Register with PMF */
 	if (!pmf_device_register1(sc->sc_dv, ld_suspend, NULL, ld_shutdown))
 		aprint_error_dev(sc->sc_dv,
 		    "couldn't establish power handler\n");
 @@ -616,30 +617,34 @@ ldstrategy(struct buf *bp)
 	if ((bp->b_bcount % lp->d_secsize) != 0 || bp->b_blkno < 0) {
 		bp->b_error = EINVAL;
 		goto done;
+	}
 	/* If it's a null transfer, return immediately. */
 	if (bp->b_bcount == 0)
 		goto done;
 	/*
 	 * Do bounds checking and adjust the transfer.  If error, process.
 	 * If past the end of partition, just return.
 	 */
-	if (part != RAW_PART &&
+	if (part == RAW_PART) {
-	    bounds_check_with_label(&sc->sc_dk, bp,
+		if (bounds_check_with_mediasize(bp, DEV_BSIZE,
-	    (sc->sc_flags & (LDF_WLABEL | LDF_LABELLING)) != 0) <= 0) {
+		    sc->sc_disksize512) <= 0)
-		goto done;
+			goto done;
 	} else {
 		if (bounds_check_with_label(&sc->sc_dk, bp,
 		    (sc->sc_flags & (LDF_WLABEL | LDF_LABELLING)) != 0) <= 0)
 			goto done;
+	}
 	/*
 	 * Convert the block number to absolute and put it in terms
 	 * of the device's logical block size.
 	 */
 	if (lp->d_secsize == DEV_BSIZE)
 		blkno = bp->b_blkno;
 	else if (lp->d_secsize > DEV_BSIZE)
 		blkno = bp->b_blkno / (lp->d_secsize / DEV_BSIZE);
 	else
 		blkno = bp->b_blkno * (DEV_BSIZE / lp->d_secsize);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ldvar.h,v 1.17 2009/12/18 00:40:24 jakllsch Exp $	*/
+/*	$NetBSD: ldvar.h,v 1.18 2010/09/20 06:54:06 kiyohara Exp $	*/
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Doran.
+ *
  * 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.
 @@ -42,26 +42,27 @@
 struct ld_softc {
 	device_t sc_dv;
 	struct	disk sc_dk;
 	struct	bufq_state *sc_bufq;
 	kmutex_t sc_mutex;
 #if NRND > 0
 	rndsource_element_t	sc_rnd_source;
 #endif
 	int	sc_queuecnt;		/* current h/w queue depth */
 	int	sc_ncylinders;		/* # cylinders */
 	int	sc_nheads;		/* # heads */
 	int	sc_nsectors;		/* # sectors per track */
 	int	sc_disksize512;
 	/*
 	 * The following are filled by hardware specific attachment code.
 	 */
 	int	sc_flags;		/* control flags */
 	uint64_t	sc_secperunit;		/* # sectors in total */
 	int	sc_secsize;		/* sector size in bytes */
 	int	sc_maxxfer;		/* max xfer size in bytes */
 	int	sc_maxqueuecnt;		/* maximum h/w queue depth */
 	int	(*sc_dump)(struct ld_softc *, void *, int, int);
 	int	(*sc_flush)(struct ld_softc *, int);
 	int	(*sc_start)(struct ld_softc *, struct buf *);