svn commit: r207062 - stable/7/sys/geom

[Andriy Gapon]

Author: avg
Date: Thu Apr 22 12:50:01 2010
New Revision: 207062
URL: http://svn.freebsd.org/changeset/base/207062

Log:
  MFC r206650: g_io_check: respond to zero pp->mediasize with ENXIO

Modified:
  stable/7/sys/geom/geom_io.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/geom/geom_io.c
==============================================================================
--- stable/7/sys/geom/geom_io.c	Thu Apr 22 12:24:59 2010	(r207061)
+++ stable/7/sys/geom/geom_io.c	Thu Apr 22 12:50:01 2010	(r207062)
@@ -297,8 +297,8 @@ g_io_check(struct bio *bp)
 	case BIO_READ:
 	case BIO_WRITE:
 	case BIO_DELETE:
-		/* Zero sectorsize is a probably lack of media */
-		if (pp->sectorsize == 0)
+		/* Zero sectorsize or mediasize is probably a lack of media. */
+		if (pp->sectorsize == 0 || pp->mediasize == 0)
 			return (ENXIO);
 		/* Reject I/O not on sector boundary */
 		if (bp->bio_offset % pp->sectorsize)